diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-22 18:50:57 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-22 18:50:57 +0000 |
| commit | 6d3eb2e4c787bce698ede74ced0dd8cae69cadc8 (patch) | |
| tree | 682f8802132f1eb040fc6a6bc3990111bfe6f7dc /chrome/browser/ui/gtk/gtk_theme_service.cc | |
| parent | e521565fe8c0611559a7b289b8d923a79b5871d0 (diff) | |
| download | chromium_src-6d3eb2e4c787bce698ede74ced0dd8cae69cadc8.zip chromium_src-6d3eb2e4c787bce698ede74ced0dd8cae69cadc8.tar.gz chromium_src-6d3eb2e4c787bce698ede74ced0dd8cae69cadc8.tar.bz2 | |
[Themes] Add UsingNativeTheme() method to ThemeService
Remove GtkThemeInstalledInfobarDelegate and make
ThemeInstalledInfobarDelegate use UsingNativeTheme().
Make some sync code use UsingNativeTheme().
BUG=80197
TEST=
Review URL: http://codereview.chromium.org/6883129
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82680 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/gtk_theme_service.cc')
| -rw-r--r-- | chrome/browser/ui/gtk/gtk_theme_service.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/ui/gtk/gtk_theme_service.cc b/chrome/browser/ui/gtk/gtk_theme_service.cc index ced0710..4ca5c9b 100644 --- a/chrome/browser/ui/gtk/gtk_theme_service.cc +++ b/chrome/browser/ui/gtk/gtk_theme_service.cc @@ -352,10 +352,14 @@ void GtkThemeService::SetNativeTheme() { NotifyThemeChanged(); } -bool GtkThemeService::UsingDefaultTheme() { +bool GtkThemeService::UsingDefaultTheme() const { return !use_gtk_ && ThemeService::UsingDefaultTheme(); } +bool GtkThemeService::UsingNativeTheme() const { + return use_gtk_; +} + void GtkThemeService::Observe(NotificationType type, const NotificationSource& source, const NotificationDetails& details) { @@ -390,7 +394,7 @@ GtkWidget* GtkThemeService::CreateToolbarSeparator() { } bool GtkThemeService::UseGtkTheme() const { - return use_gtk_; + return UsingNativeTheme(); } GdkColor GtkThemeService::GetGdkColor(int id) const { |