diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-23 17:36:42 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-23 17:36:42 +0000 |
commit | a0ea76cbf036408912e337653500aaefd51586b9 (patch) | |
tree | ed1bf3f0a50025df8c2d4b7e083593ded4d2e01a /chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc | |
parent | 58492209d54a3af3e40fa0a876c9d6381d943188 (diff) | |
download | chromium_src-a0ea76cbf036408912e337653500aaefd51586b9.zip chromium_src-a0ea76cbf036408912e337653500aaefd51586b9.tar.gz chromium_src-a0ea76cbf036408912e337653500aaefd51586b9.tar.bz2 |
Theme system cleanup
- Removes useless dependencies on themeing from content/
- Renames BrowserThemeProvider to ThemeService, along with name variants such
as GtkThemeService. BrowserThemeProvider has grown by a lot to be more than
an implementation of the ui::ThemeProvider interface. This change touches
everything.
- Rename theme_service.{h,cc} (which defined ThemeServiceFactory) to
theme_service_factory.{h,cc}.
BUG=77155
TEST=compiles.
Review URL: http://codereview.chromium.org/6727005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79145 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc')
-rw-r--r-- | chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc index 037d970..7d4c884 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc @@ -23,7 +23,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" -#include "chrome/browser/ui/gtk/gtk_theme_provider.h" +#include "chrome/browser/ui/gtk/gtk_theme_service.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "content/common/notification_service.h" #include "grit/theme_resources.h" @@ -276,7 +276,7 @@ AutocompletePopupViewGtk::AutocompletePopupViewGtk( location_bar_(location_bar), window_(gtk_window_new(GTK_WINDOW_POPUP)), layout_(NULL), - theme_provider_(GtkThemeProvider::GetFrom(profile)), + theme_service_(GtkThemeService::GetFrom(profile)), font_(font.DeriveFont(kEditFontAdjust)), ignore_mouse_drag_(false), opened_(false) { @@ -313,7 +313,7 @@ AutocompletePopupViewGtk::AutocompletePopupViewGtk( registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED, NotificationService::AllSources()); - theme_provider_->InitThemesFor(this); + theme_service_->InitThemesFor(this); // TODO(erg): There appears to be a bug somewhere in something which shows // itself when we're in NX. Previously, we called @@ -393,10 +393,10 @@ void AutocompletePopupViewGtk::Observe(NotificationType type, const NotificationDetails& details) { DCHECK(type == NotificationType::BROWSER_THEME_CHANGED); - if (theme_provider_->UseGtkTheme()) { + if (theme_service_->UseGtkTheme()) { gtk_util::UndoForceFontSize(window_); - border_color_ = theme_provider_->GetBorderColor(); + border_color_ = theme_service_->GetBorderColor(); gtk_util::GetTextColors( &background_color_, &selected_background_color_, @@ -504,7 +504,7 @@ GdkPixbuf* AutocompletePopupViewGtk::IconForMatch( } // TODO(estade): Do we want to flip these for RTL? (Windows doesn't). - return theme_provider_->GetPixbufNamed(icon); + return theme_service_->GetPixbufNamed(icon); } gboolean AutocompletePopupViewGtk::HandleMotion(GtkWidget* widget, |