diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-10 19:41:53 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-10 19:41:53 +0000 |
| commit | af62bb4afd0dba5e607643f818a08a2aec642a80 (patch) | |
| tree | 577687d6570ae15b9d23ccf2673eb669a31c4866 /chrome/browser/gtk/toolbar_star_toggle_gtk.cc | |
| parent | b8da78ad0ca066ada021b02bf4aaf1a686ef5af3 (diff) | |
| download | chromium_src-af62bb4afd0dba5e607643f818a08a2aec642a80.zip chromium_src-af62bb4afd0dba5e607643f818a08a2aec642a80.tar.gz chromium_src-af62bb4afd0dba5e607643f818a08a2aec642a80.tar.bz2 | |
Revert "Revert "Add button tinting to the toolbar buttons.""
This reverts commit r20399 and re-applies the button tinting
code. There's a fix for the go button gtk unittest by checking
to see if the browser is non-NULL before getting the theme provider.
TBR=erg
Review URL: http://codereview.chromium.org/155369
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20402 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/toolbar_star_toggle_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/toolbar_star_toggle_gtk.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/gtk/toolbar_star_toggle_gtk.cc b/chrome/browser/gtk/toolbar_star_toggle_gtk.cc index 77c5732..2692df7 100644 --- a/chrome/browser/gtk/toolbar_star_toggle_gtk.cc +++ b/chrome/browser/gtk/toolbar_star_toggle_gtk.cc @@ -8,14 +8,17 @@ #include "base/gfx/rect.h" #include "chrome/browser/gtk/bookmark_bubble_gtk.h" #include "chrome/browser/gtk/browser_toolbar_gtk.h" +#include "chrome/browser/profile.h" #include "grit/theme_resources.h" ToolbarStarToggleGtk::ToolbarStarToggleGtk(BrowserToolbarGtk* host) : host_(host), widget_(gtk_button_new()), is_starred_(false), - unstarred_(IDR_STAR, IDR_STAR_P, IDR_STAR_H, IDR_STAR_D), - starred_(IDR_STARRED, IDR_STARRED_P, IDR_STARRED_H, 0) { + unstarred_(host->profile()->GetThemeProvider(), IDR_STAR, IDR_STAR_P, + IDR_STAR_H, IDR_STAR_D), + starred_(host->profile()->GetThemeProvider(), IDR_STARRED, IDR_STARRED_P, + IDR_STARRED_H, 0) { gtk_widget_set_size_request(widget_.get(), gdk_pixbuf_get_width(unstarred_.pixbufs(0)), gdk_pixbuf_get_height(unstarred_.pixbufs(0))); |