[AiS] adding positive and negative theme values

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"
 #include "chrome/browser/ui/libgtk2ui/gtk2_util.h"
 #include "chrome/browser/ui/libgtk2ui/skia_utils_gtk2.h"
+#include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/native_theme/common_theme.h"
 
 namespace {
 
 // Theme colors returned by GetSystemColor().
@@ skipping 63 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(uint32_t color, const GdkColor& background) {

[Peter Kasting, 2015/03/18 22:00:04]

Use SkColor here, not uint32_t.

[dschuyler, 2015/03/18 22:03:35]

Done.

+  return libgtk2ui::SkColorToGdkColor(color_utils::GetReadableColor(
+      color, libgtk2ui::GdkColorToSkColor(background)));
+}
+
 }  // namespace
 
 
 namespace libgtk2ui {
 
 // static
 NativeThemeGtk2* NativeThemeGtk2::instance() {
   CR_DEFINE_STATIC_LOCAL(NativeThemeGtk2, s_native_theme, ());
   return &s_native_theme;
 }
@@ skipping 260 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(SK_ColorGREEN,
+                              GetEntryStyle()->base[GTK_STATE_NORMAL]);
+    }
+    case kColorId_ResultsTablePositiveHoveredText: {
+      return GetReadableColor(SK_ColorGREEN,
+                              GetEntryStyle()->base[GTK_STATE_PRELIGHT]);
+    }
+    case kColorId_ResultsTablePositiveSelectedText: {
+      return GetReadableColor(SK_ColorGREEN,
+                              GetEntryStyle()->base[GTK_STATE_SELECTED]);
+    }
+    case kColorId_ResultsTableNegativeText: {
+      return GetReadableColor(SK_ColorRED,
+                              GetEntryStyle()->base[GTK_STATE_NORMAL]);
+    }
+    case kColorId_ResultsTableNegativeHoveredText: {
+      return GetReadableColor(SK_ColorRED,
+                              GetEntryStyle()->base[GTK_STATE_PRELIGHT]);
+    }
+    case kColorId_ResultsTableNegativeSelectedText: {
+      return GetReadableColor(SK_ColorRED,
+                              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