Reland: Replace CONTROL_BACKGROUND and DETACHED_BOOKMARK_BAR_BACKGROUND by COLOR_NTP_BACKGROUND

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.h"
 
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
@@ skipping 39 matching lines @@
   Profile* profile = [controller_ profile];
   if (!profile)
     return;
 
   [[NSColor whiteColor] set];
   NSRectFill(dirtyRect);
 
   // Overlay with a lighter background color.
   const ui::ThemeProvider& tp =
       ThemeService::GetThemeProviderForProfile(profile);
-  NSColor* toolbarColor =
-      tp.GetNSColor(ThemeProperties::COLOR_DETACHED_BOOKMARK_BAR_BACKGROUND);
+  NSColor* toolbarColor = tp.GetNSColor(ThemeProperties::COLOR_NTP_BACKGROUND);
   CGFloat alpha = morph * [toolbarColor alphaComponent];
   [[toolbarColor colorWithAlphaComponent:alpha] set];
   NSRectFillUsingOperation(dirtyRect, NSCompositeSourceOver);
 
   // Fade in/out the background.
   {
     gfx::ScopedNSGraphicsContextSaveGState bgScopedState;
     NSGraphicsContext* context = [NSGraphicsContext currentContext];
     CGContextRef cgContext = static_cast<CGContextRef>([context graphicsPort]);
     CGContextSetAlpha(cgContext, 1 - morph);
@@ skipping 11 matching lines @@
     strokeColor = [[self strokeColor] blendedColorWithFraction:morph
                                                        ofColor:strokeColor];
     strokeColor = [strokeColor colorWithAlphaComponent:0.5];
     [strokeColor set];
     NSRectFillUsingOperation(NSIntersectionRect(strokeRect, dirtyRect),
                              NSCompositeSourceOver);
   }
 }
 
 @end  // @implementation BookmarkBarToolbarView