diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-29 14:05:08 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-29 14:05:08 +0000 |
| commit | 0d95693ed12939d0fe8dd5f07649d2c481bd55b1 (patch) | |
| tree | d068d8e5450e3c00556dabdf7ecfd9dabfd7d3ba | |
| parent | 4b10905000003f3708de74054524da17c4c5880b (diff) | |
| download | chromium_src-0d95693ed12939d0fe8dd5f07649d2c481bd55b1.zip chromium_src-0d95693ed12939d0fe8dd5f07649d2c481bd55b1.tar.gz chromium_src-0d95693ed12939d0fe8dd5f07649d2c481bd55b1.tar.bz2 | |
gtk: Get rid of GtkThemeService::UseGtkTheme() function.
(Note: This was a TODO for akalin).
BUG=None
TEST=None
R=akalin@chromium.org,evan@chromium.org
Review URL: http://codereview.chromium.org/6883258
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83510 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/gtk/gtk_theme_service.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/ui/gtk/gtk_theme_service.h | 6 | ||||
| -rw-r--r-- | tools/valgrind/memcheck/suppressions.txt | 4 |
3 files changed, 3 insertions, 13 deletions
diff --git a/chrome/browser/ui/gtk/gtk_theme_service.cc b/chrome/browser/ui/gtk/gtk_theme_service.cc index 8aa26b3..0da4875 100644 --- a/chrome/browser/ui/gtk/gtk_theme_service.cc +++ b/chrome/browser/ui/gtk/gtk_theme_service.cc @@ -393,10 +393,6 @@ GtkWidget* GtkThemeService::CreateToolbarSeparator() { return alignment; } -bool GtkThemeService::UseGtkTheme() const { - return UsingNativeTheme(); -} - GdkColor GtkThemeService::GetGdkColor(int id) const { return gfx::SkColorToGdkColor(GetColor(id)); } @@ -1104,7 +1100,7 @@ void GtkThemeService::OnDestroyChromeButton(GtkWidget* button) { gboolean GtkThemeService::OnSeparatorExpose(GtkWidget* widget, GdkEventExpose* event) { - if (UseGtkTheme()) + if (UsingNativeTheme()) return FALSE; cairo_t* cr = gdk_cairo_create(GDK_DRAWABLE(widget->window)); diff --git a/chrome/browser/ui/gtk/gtk_theme_service.h b/chrome/browser/ui/gtk/gtk_theme_service.h index 127a04d..25e69e7 100644 --- a/chrome/browser/ui/gtk/gtk_theme_service.h +++ b/chrome/browser/ui/gtk/gtk_theme_service.h @@ -72,12 +72,6 @@ class GtkThemeService : public ThemeService { // Creates a theme-aware vertical separator widget. GtkWidget* CreateToolbarSeparator(); - // Whether we should use the GTK system theme. - // - // TODO(akalin): Make all callers use UsingNativeTheme() instead and - // remove this. - bool UseGtkTheme() const; - // A wrapper around ui::ThemeProvider::GetColor, transforming the result to a // GdkColor. GdkColor GetGdkColor(int id) const; diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt index 5a293e1..8598771 100644 --- a/tools/valgrind/memcheck/suppressions.txt +++ b/tools/valgrind/memcheck/suppressions.txt @@ -1987,7 +1987,7 @@ { bug_41186 Memcheck:Addr1 - fun:_ZNK16GtkThemeProvider11UseGtkThemeEv + fun:_ZNK16GtkThemeProvider11UsingNativeThemeEv fun:_ZN12browser_sync*14UseSystemThemeEP7Profile fun:_ZN12browser_sync33GetThemeSpecificsFromCurrentThemeEP7ProfilePN7sync_pb14ThemeSpecificsE fun:_ZN12browser_sync44SetCurrentThemeFromThemeSpecificsIfNecessaryERKN7sync_pb14ThemeSpecificsEP7Profile @@ -3196,7 +3196,7 @@ { bug_63672 Memcheck:Addr1 - fun:_ZNK16GtkThemeProvider11UseGtkThemeEv + fun:_ZNK16GtkThemeProvider11UsingNativeThemeEv fun:_ZN12browser_sync67_GLOBAL__N_chrome_browser_sync_glue_theme_util.cc_00000000_1C67A97A14UseSystemThemeEP7Profile fun:_ZN12browser_sync33GetThemeSpecificsFromCurrentThemeEP7ProfilePN7sync_pb14ThemeSpecificsE fun:_ZN12browser_sync44SetCurrentThemeFromThemeSpecificsIfNecessaryERKN7sync_pb14ThemeSpecificsEP7Profile |