GTK: Fix highlight and image colors in the new wrench menu.

chrome/browser/gtk/gtk_theme_provider.h

 // Copyright (c) 2010 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_GTK_GTK_THEME_PROVIDER_H_
 #define CHROME_BROWSER_GTK_GTK_THEME_PROVIDER_H_
 
 #include <gtk/gtk.h>
 #include <map>
 #include <string>
@@ skipping 52 matching lines @@
   bool UseGtkTheme() const;
 
   // A wrapper around ThemeProvider::GetColor, transforming the result to a
   // GdkColor.
   GdkColor GetGdkColor(int id) const;
 
   // A weighted average between the text color and the background color of a
   // label. Used for borders between GTK stuff and the webcontent.
   GdkColor GetBorderColor() const;
 
+  // Returns a set of icons tinted for different GtkStateTypes based on the
+  // label colors for the IDR resource |id|.
+  GtkIconSet* GetIconSetForId(int id) const;
+
   // This method returns averages of the thumb part and of the track colors.
   // Used when rendering scrollbars.
   static void GetScrollbarColors(GdkColor* thumb_active_color,
                                  GdkColor* thumb_inactive_color,
                                  GdkColor* track_color);
 
   // Expose the inner label. Only used for testing.
   GtkWidget* fake_label() { return fake_label_.get(); }
 
   // Returns a CairoCachedSurface for a particular Display. CairoCachedSurfaces
@@ skipping 54 matching lines @@
   // Additionally frees the CairoCachedSurfaces.
   virtual void FreePlatformCaches();
 
   // Extracts colors and tints from the GTK theme, both for the
   // BrowserThemeProvider interface and the colors we send to webkit.
   void LoadGtkValues();
 
   // Sets the values that we send to webkit to safe defaults.
   void LoadDefaultValues();
 
+  // Builds all of the tinted menus images needed for custom buttons. This is
+  // always called on style-set even if we aren't using the gtk-theme because
+  // the menus are always rendered with gtk colors.
+  void RebuildMenuIconSets();
+
+  // Builds and tints the image with |id| to the GtkStateType |state| and
+  // places the result in |icon_set|.
+  void BuildIconFromIDRWithColor(int id,
+                                 GtkStyle* style,
+                                 GtkStateType state,
+                                 GtkIconSet* icon_set);
+
   // Sets the underlying theme colors/tints from a GTK color.
   void SetThemeColorFromGtk(int id, const GdkColor* color);
   void SetThemeTintFromGtk(int id, const GdkColor* color);
   void BuildTintedFrameColor(int color_id, int tint_id);
   void SetTintToExactColor(int id, const GdkColor* color);
 
   // Split out from FreePlatformCaches so it can be called in our destructor;
   // FreePlatformCaches() is called from the BrowserThemeProvider's destructor,
   // but by the time ~BrowserThemeProvider() is run, the vtable no longer
   // points to GtkThemeProvider's version.
   void FreePerDisplaySurfaces(PerDisplaySurfaceMap* per_display_map);
 
+  // Frees all the created GtkIconSets we use for the chrome menu.
+  void FreeIconSets();
+
   // Lazily generates each bitmap used in the gtk theme.
   SkBitmap* GenerateGtkThemeBitmap(int id) const;
 
   // Tints IDR_THEME_FRAME based based on |tint_id|. Used during lazy
   // generation of the gtk theme bitmaps.
   SkBitmap* GenerateFrameImage(int tint_id) const;
 
   // Takes the base frame image |base_id| and tints it with |tint_id|.
   SkBitmap* GenerateTabImage(int base_id) const;
 
@@ skipping 23 matching lines @@
 
   // Whether we should be using gtk rendering.
   bool use_gtk_;
 
   // GtkWidgets that exist only so we can look at their properties (and take
   // their colors).
   GtkWidget* fake_window_;
   GtkWidget* fake_frame_;
   OwnedWidgetGtk fake_label_;
   OwnedWidgetGtk fake_entry_;
+  OwnedWidgetGtk fake_menu_item_;
 
   // A list of all GtkChromeButton instances. We hold on to these to notify
   // them of theme changes.
   std::vector<GtkWidget*> chrome_buttons_;
 
   // Tracks all the signals we have connected to on various widgets.
   GtkSignalRegistrar signals_;
 
   // Tints and colors calculated by LoadGtkValues() that are given to the
   // caller while |use_gtk_| is true.
   ColorMap colors_;
   TintMap tints_;
 
   // Colors used to tint certain icons.
   color_utils::HSL button_tint_;
   color_utils::HSL entry_tint_;
   color_utils::HSL selected_entry_tint_;
 
   // Colors that we pass to WebKit. These are generated each time the theme
   // changes.
   SkColor focus_ring_color_;
   SkColor thumb_active_color_;
   SkColor thumb_inactive_color_;
   SkColor track_color_;
   SkColor active_selection_bg_color_;
   SkColor active_selection_fg_color_;
   SkColor inactive_selection_bg_color_;
   SkColor inactive_selection_fg_color_;
 
+  // A GtkIconSet that has the tinted icons for the NORMAL and PRELIGHT states
+  // of the IDR_FULLSCREEN_MENU_BUTTON tinted to the respective menu item label
+  // colors.
+  GtkIconSet* fullscreen_icon_set_;
+
   // Image cache of lazily created images, created when requested by
   // GetBitmapNamed().
   mutable ImageCache gtk_images_;
 
   // Cairo surfaces for each GdkDisplay.
   PerDisplaySurfaceMap per_display_surfaces_;
   PerDisplaySurfaceMap per_display_unthemed_surfaces_;
 
   // This is a dummy widget that only exists so we have something to pass to
   // gtk_widget_render_icon().
   static GtkWidget* icon_widget_;
 
   // The default folder icon and default bookmark icon for the GTK theme.
   // These are static because the system can only have one theme at a time.
   // They are cached when they are requested the first time, and cleared when
   // the system theme changes.
   static GdkPixbuf* default_folder_icon_;
   static GdkPixbuf* default_bookmark_icon_;
 };
 
 #endif  // CHROME_BROWSER_GTK_GTK_THEME_PROVIDER_H_