Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(388)

Unified Diff: chrome/browser/themes/theme_service_aurax11.h

Issue 19471005: Add custom default theme support and create a managed user default theme. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments and add tests. Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/themes/theme_service_aurax11.h
diff --git a/chrome/browser/themes/theme_service_aurax11.h b/chrome/browser/themes/theme_service_aurax11.h
index 96dce92df031d72081e6283cd6ac1063deb04636..92f9347db2db03673cd8bb0f19153257762905b3 100644
--- a/chrome/browser/themes/theme_service_aurax11.h
+++ b/chrome/browser/themes/theme_service_aurax11.h
@@ -5,7 +5,6 @@
#ifndef CHROME_BROWSER_THEMES_THEME_SERVICE_AURAX11_H_
#define CHROME_BROWSER_THEMES_THEME_SERVICE_AURAX11_H_
-#include "base/prefs/pref_change_registrar.h"
#include "chrome/browser/themes/theme_service.h"
// A subclass of ThemeService that queries the current ui::LinuxUI instance for
@@ -15,28 +14,13 @@ class ThemeServiceAuraX11 : public ThemeService {
ThemeServiceAuraX11();
virtual ~ThemeServiceAuraX11();
- // Overridden from ui::ThemeProvider:
- virtual SkColor GetColor(int id) const OVERRIDE;
- virtual bool HasCustomImage(int id) const OVERRIDE;
-
// Overridden from ThemeService:
- virtual void Init(Profile* profile) OVERRIDE;
- virtual gfx::Image GetImageNamed(int id) const OVERRIDE;
- virtual void SetTheme(const extensions::Extension* extension) OVERRIDE;
- virtual void UseDefaultTheme() OVERRIDE;
+ virtual bool ShouldInitWithNativeTheme() OVERRIDE;
virtual void SetNativeTheme() OVERRIDE;
virtual bool UsingDefaultTheme() const OVERRIDE;
virtual bool UsingNativeTheme() const OVERRIDE;
private:
- void OnUsesSystemThemeChanged();
-
- // Whether we'll give the ui::LinuxUI object first shot at providing theme
- // resources.
- bool use_system_theme_;
-
- PrefChangeRegistrar registrar_;
-
DISALLOW_COPY_AND_ASSIGN(ThemeServiceAuraX11);
};

Powered by Google App Engine
This is Rietveld 408576698