Replace CONTROL_BACKGROUND and DETACHED_BOOKMARK_BAR_BACKGROUND by COLOR_NTP_BACKGROUND

chrome/browser/ui/views/frame/browser_view.cc

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 477072586102eb11eb993f8ab798892c8004edfa..847cde5363c9d816b0d3102858a2035ba48a61a7 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -224,11 +224,10 @@ void PaintDetachedBookmarkBar(gfx::Canvas* canvas,
   // 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.
-  canvas->FillRect(fill_rect,
-                   tp->GetColor(ThemeProperties::COLOR_CONTROL_BACKGROUND));
   canvas->FillRect(
       fill_rect,
-      tp->GetColor(ThemeProperties::COLOR_DETACHED_BOOKMARK_BAR_BACKGROUND));
+      SkColorSetA(tp->GetColor(ThemeProperties::COLOR_NTP_BACKGROUND),
+                  SK_AlphaOPAQUE));
 
   // Draw the separators above and below bookmark bar;
   // if animating, these are fading in/out.
@@ -2069,7 +2068,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(