Reland: Replace CONTROL_BACKGROUND and DETACHED_BOOKMARK_BAR_BACKGROUND by COLOR_NTP_BACKGROUND

chrome/browser/themes/theme_properties.h

 // Copyright (c) 2013 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.
 
 #ifndef CHROME_BROWSER_THEMES_THEME_PROPERTIES_H_
 #define CHROME_BROWSER_THEMES_THEME_PROPERTIES_H_
 
 #include <set>
 #include <string>
 
@@ skipping 64 matching lines @@
     REPEAT_Y = 2,
     REPEAT = 3
   };
 
   // --------------------------------------------------------------------------
   // The int value of the properties in NotOverwritableByUserThemeProperties
   // has no special meaning. Modify the enum to your heart's content.
   // The enum takes on values >= 1000 as not to overlap with
   // OverwritableByUserThemeProperties.
   enum NotOverwritableByUserThemeProperty {
-    COLOR_CONTROL_BACKGROUND = 1000,
-
     // The color of the line separating the bottom of the toolbar from the
     // contents.
-    COLOR_TOOLBAR_BOTTOM_SEPARATOR,
+    COLOR_TOOLBAR_BOTTOM_SEPARATOR = 1000,
 
     // The color of a normal toolbar button's icon.
     COLOR_TOOLBAR_BUTTON_ICON,
     // The color of a disabled toolbar button's icon.
     COLOR_TOOLBAR_BUTTON_ICON_INACTIVE,
 
     // The color of the line separating the top of the toolbar from the region
     // above. For a tabbed browser window, this is the line along the bottom
     // edge of the tabstrip, the stroke around the tabs, and the new tab button
     // stroke/shadow color.
     COLOR_TOOLBAR_TOP_SEPARATOR,
     COLOR_TOOLBAR_TOP_SEPARATOR_INACTIVE,
 
     // Colors of vertical separators, such as on the bookmark bar or on the DL
     // shelf.
     COLOR_TOOLBAR_VERTICAL_SEPARATOR,
 
     // The color of a background tab, as well as the new tab button.
     COLOR_BACKGROUND_TAB,
 
     // The color of the "instructions text" in an empty bookmarks bar.
     COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT,
 
     // Colors used for the detached (NTP) bookmark bar.
-    COLOR_DETACHED_BOOKMARK_BAR_BACKGROUND,
     COLOR_DETACHED_BOOKMARK_BAR_SEPARATOR,
 
     // The throbber colors for tabs or anything on a toolbar (currently, only
     // the download shelf). If you're adding a throbber elsewhere, such as in
     // a dialog or bubble, you likely want
     // NativeTheme::kColorId_ThrobberSpinningColor.
     COLOR_TAB_THROBBER_SPINNING,
     COLOR_TAB_THROBBER_WAITING,
 
     // These colors don't have constant default values. They are derived from
@@ skipping 58 matching lines @@
 
   // Returns the default color for the given color |id| COLOR_* enum value.
   // Returns gfx::kPlaceholderColor if |id| is invalid.
   static SkColor GetDefaultColor(int id, bool otr);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(ThemeProperties);
 };
 
 #endif  // CHROME_BROWSER_THEMES_THEME_PROPERTIES_H_