Clean up NativeTheme (particularly CommonTheme).

chrome/browser/ui/libgtk2ui/gtk2_ui.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h"
 
 #include <math.h>
 #include <pango/pango.h>
 #include <X11/Xcursor/Xcursor.h>
 #include <set>
@@ skipping 795 matching lines @@
 
 void Gtk2UI::LoadGtkValues() {
   // TODO(erg): GtkThemeService had a comment here about having to muck with
   // the raw Prefs object to remove prefs::kCurrentThemeImages or else we'd
   // regress startup time. Figure out how to do that when we can't access the
   // prefs system from here.
 
   NativeThemeGtk2* theme = NativeThemeGtk2::instance();
 
   SkColor toolbar_color =
-      theme->GetSystemColor(ui::NativeTheme::kColorId_LabelBackgroundColor);
+      theme->GetSystemColor(ui::NativeTheme::kColorId_DialogBackground);
   SkColor label_color =
       theme->GetSystemColor(ui::NativeTheme::kColorId_LabelEnabledColor);
 
   colors_[ThemeProperties::COLOR_CONTROL_BACKGROUND] = toolbar_color;
   colors_[ThemeProperties::COLOR_TOOLBAR] = toolbar_color;
 
   colors_[ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON] =
       color_utils::DeriveDefaultIconColor(label_color);
 
   colors_[ThemeProperties::COLOR_TAB_TEXT] = label_color;
@@ skipping 199 matching lines @@
   set_frame_color(ThemeProperties::COLOR_FRAME_INACTIVE);
   set_frame_color(ThemeProperties::COLOR_FRAME_INCOGNITO);
   set_frame_color(ThemeProperties::COLOR_FRAME_INCOGNITO_INACTIVE);
 #endif
 }
 
 void Gtk2UI::GetNormalButtonTintHSL(color_utils::HSL* tint) const {
   NativeThemeGtk2* theme = NativeThemeGtk2::instance();
 
   SkColor accent_color =
-      theme->GetSystemColor(
-          ui::NativeTheme::kColorId_ButtonHighlightColor);
+      theme->GetSystemColor(ui::NativeTheme::kColorId_ProminentButtonColor);
   SkColor text_color =
       theme->GetSystemColor(
           ui::NativeTheme::kColorId_LabelEnabledColor);
   SkColor base_color =
-      theme->GetSystemColor(
-          ui::NativeTheme::kColorId_LabelBackgroundColor);
+      theme->GetSystemColor(ui::NativeTheme::kColorId_DialogBackground);
 
   PickButtonTintFromColors(accent_color, text_color, base_color, tint);
 }
 
 void Gtk2UI::GetNormalEntryForegroundHSL(color_utils::HSL* tint) const {
   NativeThemeGtk2* theme = NativeThemeGtk2::instance();
 
   SkColor accent_color =
-      theme->GetSystemColor(
-          ui::NativeTheme::kColorId_ButtonHighlightColor);
+      theme->GetSystemColor(ui::NativeTheme::kColorId_ProminentButtonColor);
   SkColor text_color =
       theme->GetSystemColor(
           ui::NativeTheme::kColorId_TextfieldDefaultColor);
   SkColor base_color =
       theme->GetSystemColor(
           ui::NativeTheme::kColorId_TextfieldDefaultBackground);
 
   PickButtonTintFromColors(accent_color, text_color, base_color, tint);
 }
 
@@ skipping 70 matching lines @@
   // Blacklist scaling factors <130% (crbug.com/484400) and round
   // to 1 decimal to prevent rendering problems (crbug.com/485183).
   return scale < 1.3f ? 1.0f : roundf(scale * 10) / 10;
 }
 
 }  // namespace libgtk2ui
 
 views::LinuxUI* BuildGtk2UI() {
   return new libgtk2ui::Gtk2UI;
 }