Gtk3: More fixes and refactorings

chrome/browser/ui/libgtkui/gtk_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/libgtkui/gtk_ui.h"
 
 #include <math.h>
 #include <pango/pango.h>
 #include <X11/Xcursor/Xcursor.h>
 
@@ skipping 823 matching lines @@
 
   colors_[ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON] = toolbar_text_color;
 
   // Tabs use the same background color as the toolbar, so use the
   // toolbar text color as the tab text color.
   colors_[ThemeProperties::COLOR_TAB_TEXT] = toolbar_text_color;
   colors_[ThemeProperties::COLOR_BOOKMARK_TEXT] = toolbar_text_color;
   colors_[ThemeProperties::COLOR_BACKGROUND_TAB_TEXT] =
       color_utils::BlendTowardOppositeLuma(toolbar_text_color, 50);
 
-  // Color drawn around the location bar.
-  colors_[ThemeProperties::COLOR_LOCATION_BAR_BORDER] =
+  SkColor location_bar_border =
       GetBorderColor("GtkToolbar#toolbar GtkEntry#entry");
+  if (SkColorGetA(location_bar_border)) {
+    colors_[ThemeProperties::COLOR_LOCATION_BAR_BORDER] = location_bar_border;
+  }
 
-  inactive_selection_bg_color_ =
-      GetBgColor("GtkEntry#entry:backdrop #selection:selected");
+  inactive_selection_bg_color_ = GetSelectedBgColor("GtkEntry#entry:backdrop");
   inactive_selection_fg_color_ =
-      GetFgColor("GtkEntry#entry:backdrop #selection:selected");
+      GetSelectedTextColor("GtkEntry#entry:backdrop");
 
   SkColor toolbar_separator_horizontal =
       GetSeparatorColor("GtkToolbar#toolbar GtkSeparator#separator.horizontal");
   SkColor toolbar_separator_vertical =
       GetSeparatorColor("GtkToolbar#toolbar GtkSeparator#separator.vertical");
   colors_[ThemeProperties::COLOR_DETACHED_BOOKMARK_BAR_BACKGROUND] =
       toolbar_color;
   colors_[ThemeProperties::COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT] =
       toolbar_text_color;
   // Separates the toolbar from the bookmark bar or butter bars.
@@ skipping 15 matching lines @@
   // Unlike with toolbars, we always want a border around tabs, so let
   // ThemeService choose the border color if the theme doesn't provide one.
   if (SkColorGetA(header_button_border) &&
       SkColorGetA(header_button_inactive_border)) {
     colors_[ThemeProperties::COLOR_TOOLBAR_TOP_SEPARATOR] =
         header_button_border;
     colors_[ThemeProperties::COLOR_TOOLBAR_TOP_SEPARATOR_INACTIVE] =
         header_button_inactive_border;
   }
 
-  SkColor ntp_bg = GetBgColor("");
-  colors_[ThemeProperties::COLOR_NTP_BACKGROUND] = ntp_bg;
-  colors_[ThemeProperties::COLOR_NTP_TEXT] =
-      color_utils::GetReadableColor(GetFgColor("GtkLabel#label"), ntp_bg);
+  colors_[ThemeProperties::COLOR_NTP_BACKGROUND] = GetBgColor("GtkEntry#entry");
+  colors_[ThemeProperties::COLOR_NTP_TEXT] = GetFgColor("GtkEntry#entry");
   colors_[ThemeProperties::COLOR_NTP_HEADER] =
       GetBorderColor("GtkButton#button");
 #endif
 
   colors_[ThemeProperties::COLOR_TOOLBAR] = toolbar_color;
   colors_[ThemeProperties::COLOR_CONTROL_BACKGROUND] = toolbar_color;
 
-  colors_[ThemeProperties::COLOR_NTP_LINK] =
-      native_theme_->GetSystemColor(ui::NativeTheme::kColorId_LinkEnabled);
+  colors_[ThemeProperties::COLOR_NTP_LINK] = native_theme_->GetSystemColor(
+      ui::NativeTheme::kColorId_TextfieldSelectionBackgroundFocused);
 
   // Generate the colors that we pass to WebKit.
   SetScrollbarColors();
-  focus_ring_color_ = native_theme_->GetSystemColor(
-      ui::NativeTheme::kColorId_TextfieldSelectionBackgroundFocused);
+  focus_ring_color_ =
+      native_theme_->GetSystemColor(ui::NativeTheme::kColorId_LinkEnabled);
 
   // Some GTK themes only define the text selection colors on the GtkEntry
   // class, so we need to use that for getting selection colors.
   active_selection_bg_color_ = native_theme_->GetSystemColor(
       ui::NativeTheme::kColorId_TextfieldSelectionBackgroundFocused);
   active_selection_fg_color_ = native_theme_->GetSystemColor(
       ui::NativeTheme::kColorId_TextfieldSelectionColor);
 
   colors_[ThemeProperties::COLOR_TAB_THROBBER_SPINNING] =
       native_theme_->GetSystemColor(
@@ skipping 132 matching lines @@
 
 float GtkUi::GetDeviceScaleFactor() const {
   return device_scale_factor_;
 }
 
 }  // namespace libgtkui
 
 views::LinuxUI* BuildGtkUi() {
   return new libgtkui::GtkUi;
 }