[AiS] for desktop, two lines and font sytles

chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc

 // 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.
 
 #include "chrome/browser/ui/libgtk2ui/native_theme_gtk2.h"
 
 #include <gtk/gtk.h>
 
 #include "chrome/browser/ui/libgtk2ui/chrome_gtk_menu_subclasses.h"
 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h"
@@ skipping 75 matching lines @@
 
   // The luminance should match the luminance of the foreground text.  Again,
   // we clamp so as to have at some amount of color (green) in the text.
   double opposite_l = fg_hsl.l;
   double l = std::max(0.1, std::min(0.9, opposite_l));
 
   color_utils::HSL output = { hue_hsl.h, s, l };
   return libgtk2ui::SkColorToGdkColor(color_utils::HSLToSkColor(output, 255));
 }
 
+GdkColor GetReadableColor(const GdkColor& color, const GdkColor& background) {
+  return libgtk2ui::SkColorToGdkColor(
+      color_utils::GetReadableColor(libgtk2ui::GdkColorToSkColor(color),
+                                    libgtk2ui::GdkColorToSkColor(background)));
+}
+
 }  // namespace
 
 
 namespace libgtk2ui {
 
 // static
 NativeThemeGtk2* NativeThemeGtk2::instance() {
   CR_DEFINE_STATIC_LOCAL(NativeThemeGtk2, s_native_theme, ());
   return &s_native_theme;
 }
@@ skipping 95 matching lines @@
       paint.setColor(color);
       break;
     default:
       NOTREACHED() << "Invalid state " << state;
       break;
   }
   canvas->drawRect(gfx::RectToSkRect(rect), paint);
 }
 
 GdkColor NativeThemeGtk2::GetSystemGdkColor(ColorId color_id) const {
+  const GdkColor kPositiveTextColor = GDK_COLOR_RGB(0x00, 0xff, 0x00);
+  const GdkColor kNegativeTextColor = GDK_COLOR_RGB(0xff, 0x00, 0x00);

[Peter Kasting, 2015/03/18 00:36:19]

I didn't notice this before, but:

You can actually avoid these constants entirely and use the Skia variants
(SK_Color[GREEN,RED]) directly below, and simply remove the first
GdkColorToSkColor() call inside your GetReadableColor helper above.

This makes the code both slightly simpler and slightly more efficient.

[dschuyler, 2015/03/18 01:19:35]

Done.

   switch (color_id) {
     // Windows
     case kColorId_WindowBackground:
       return GetWindowStyle()->bg[GTK_STATE_NORMAL];
 
     // Dialogs
     case kColorId_DialogBackground:
       return GetWindowStyle()->bg[GTK_STATE_NORMAL];
 
     // FocusableBorder
@@ skipping 145 matching lines @@
     case kColorId_ResultsTableHoveredDivider: {
       GtkStyle* win_style = GetWindowStyle();
       return GdkAlphaBlend(win_style->text[GTK_STATE_PRELIGHT],
                            win_style->bg[GTK_STATE_PRELIGHT], 0x34);
     }
     case kColorId_ResultsTableSelectedDivider: {
       GtkStyle* win_style = GetWindowStyle();
       return GdkAlphaBlend(win_style->text[GTK_STATE_SELECTED],
                            win_style->bg[GTK_STATE_SELECTED], 0x34);
     }
+    case kColorId_ResultsTablePositiveText: {
+      return GetReadableColor(kPositiveTextColor,
+                              GetEntryStyle()->base[GTK_STATE_NORMAL]);
+    }
+    case kColorId_ResultsTablePositiveHoveredText: {
+      return GetReadableColor(kPositiveTextColor,
+                              GetEntryStyle()->base[GTK_STATE_PRELIGHT]);
+    }
+    case kColorId_ResultsTablePositiveSelectedText: {
+      return GetReadableColor(kPositiveTextColor,
+                              GetEntryStyle()->base[GTK_STATE_SELECTED]);
+    }
+    case kColorId_ResultsTableNegativeText: {
+      return GetReadableColor(kNegativeTextColor,
+                              GetEntryStyle()->base[GTK_STATE_NORMAL]);
+    }
+    case kColorId_ResultsTableNegativeHoveredText: {
+      return GetReadableColor(kNegativeTextColor,
+                              GetEntryStyle()->base[GTK_STATE_PRELIGHT]);
+    }
+    case kColorId_ResultsTableNegativeSelectedText: {
+      return GetReadableColor(kNegativeTextColor,
+                              GetEntryStyle()->base[GTK_STATE_SELECTED]);
+    }
     case kColorId_NumColors:
       NOTREACHED();
       break;
   }
 
   return SkColorToGdkColor(kInvalidColorIdColor);
 }
 
 GtkWidget* NativeThemeGtk2::GetRealizedWindow() const {
   if (!fake_window_) {
@@ skipping 100 matching lines @@
                                                0, 0,
                                                rect.width(), rect.height());
   SkBitmap arrow = GdkPixbufToImageSkia(pb);
   canvas->drawBitmap(arrow, rect.x(), rect.y());
 
   g_object_unref(pb);
   g_object_unref(pm);
 }
 
 }  // namespace libgtk2ui