Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2849)

Unified Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 2248103002: Reland: Replace CONTROL_BACKGROUND and DETACHED_BOOKMARK_BAR_BACKGROUND by COLOR_NTP_BACKGROUND (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Properly handle incognito browsing Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index e0896b097faf8f623e0ab52116a4fa38167c3103..58a383b428a51bc6d5ceb2eabcfdff5ccb724bbf 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -222,15 +222,12 @@ void PaintDetachedBookmarkBar(gfx::Canvas* canvas,
if (ui::MaterialDesignController::IsModeMaterial())
fill_rect.Inset(0, 1, 0, 0);
- // In detached mode, the bar is meant to overlap with |contents_container_|.
- // The detached background color may be partially transparent, but the layer
- // for |view| must be painted opaquely to avoid subpixel anti-aliasing
- // artifacts, so we recreate the contents container base color here.
+ // The detached bar overlaps the |contents_container_| and so uses the same
+ // background color (the NTP background color).
canvas->FillRect(fill_rect,
- tp->GetColor(ThemeProperties::COLOR_CONTROL_BACKGROUND));
- canvas->FillRect(
- fill_rect,
- tp->GetColor(ThemeProperties::COLOR_DETACHED_BOOKMARK_BAR_BACKGROUND));
+ tp->GetColor(tp->HasCustomImage(IDR_THEME_NTP_BACKGROUND)
+ ? ThemeProperties::COLOR_TOOLBAR
+ : ThemeProperties::COLOR_NTP_BACKGROUND));
Julien Isorce Samsung 2016/08/16 16:01:03 It relies on HasCustomImage to avoid regression of
Peter Kasting 2016/08/18 09:12:36 Hmm. There are arguments for both. I'm inclined
// Draw the separators above and below bookmark bar;
// if animating, these are fading in/out.
@@ -2074,7 +2071,7 @@ void BrowserView::InitViews() {
contents_container_ = new views::View();
contents_container_->set_background(views::Background::CreateSolidBackground(
- GetThemeProvider()->GetColor(ThemeProperties::COLOR_CONTROL_BACKGROUND)));
+ GetThemeProvider()->GetColor(ThemeProperties::COLOR_NTP_BACKGROUND)));
contents_container_->AddChildView(devtools_web_view_);
contents_container_->AddChildView(contents_web_view_);
contents_container_->SetLayoutManager(new ContentsLayoutManager(

Powered by Google App Engine
This is Rietveld 408576698