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 /content/browser/webui | |
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 'content/browser/webui')
-rw-r--r-- | content/browser/webui/web_ui.cc | 6 | ||||
-rw-r--r-- | content/browser/webui/web_ui.h | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/content/browser/webui/web_ui.cc b/content/browser/webui/web_ui.cc index 6d7ca77..6a8e8c4 100644 --- a/content/browser/webui/web_ui.cc +++ b/content/browser/webui/web_ui.cc @@ -11,8 +11,6 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/themes/browser_theme_provider.h" -#include "chrome/browser/themes/theme_service.h" #include "chrome/browser/ui/webui/generic_handler.h" #include "chrome/common/bindings_policy.h" #include "chrome/common/render_messages.h" @@ -129,10 +127,6 @@ void WebUI::CallJavascriptFunction( ExecuteJavascript(GetJavascript(function_name, args)); } -ui::ThemeProvider* WebUI::GetThemeProvider() const { - return ThemeServiceFactory::GetForProfile(GetProfile()); -} - void WebUI::RegisterMessageCallback(const std::string &message, MessageCallback *callback) { std::pair<MessageCallbackMap::iterator, bool> result = diff --git a/content/browser/webui/web_ui.h b/content/browser/webui/web_ui.h index 2272b13..4bcda5d 100644 --- a/content/browser/webui/web_ui.h +++ b/content/browser/webui/web_ui.h @@ -24,10 +24,6 @@ class TabContents; class Value; struct ViewHostMsg_DomMessage_Params; -namespace ui { -class ThemeProvider; -} - // A WebUI sets up the datasources and message handlers for a given HTML-based // UI. It is contained by a WebUIManager. class WebUI { @@ -139,8 +135,6 @@ class WebUI { void CallJavascriptFunction(const std::string& function_name, const std::vector<const Value*>& args); - ui::ThemeProvider* GetThemeProvider() const; - // May be overridden by WebUI's which do not have a tab contents. virtual Profile* GetProfile() const; |