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

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

Issue 2062353002: 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: Bring back Patch Set 8 that landed before the revert 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
« no previous file with comments | « chrome/browser/ui/libgtk2ui/gtk2_ui.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..066027fc33553846383777e3b4d74cb2bcb6f92b 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -222,15 +222,10 @@ 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(ThemeProperties::COLOR_NTP_BACKGROUND));
// Draw the separators above and below bookmark bar;
// if animating, these are fading in/out.
@@ -2074,7 +2069,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(
« no previous file with comments | « chrome/browser/ui/libgtk2ui/gtk2_ui.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698