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 b52a722b0470f5be161161d3b640f8f55e7053bc..d2a0e1323437d9639f9b1c70f661dca097e0593f 100644 |
--- a/chrome/browser/themes/theme_service_aurax11.h |
+++ b/chrome/browser/themes/theme_service_aurax11.h |
@@ -6,24 +6,24 @@ |
#define CHROME_BROWSER_THEMES_THEME_SERVICE_AURAX11_H_ |
#include "chrome/browser/themes/theme_service.h" |
-#include "ui/views/linux_ui/native_theme_change_observer.h" |
+#include "ui/views/linux_ui/system_theme_change_observer.h" |
// A subclass of ThemeService that manages the CustomThemeSupplier which |
// provides the native X11 theme. |
class ThemeServiceAuraX11 : public ThemeService, |
- public views::NativeThemeChangeObserver { |
+ public views::SystemThemeChangeObserver { |
Elliot Glaysher
2014/04/21 23:31:47
I think you're overshooting here, though this migh
Evan Stade
2014/04/22 00:28:22
Note that there's another method with the same nam
msw
2014/04/22 18:02:13
Hopefully ThemeServiceAuraX11 won't need to observ
|
public: |
ThemeServiceAuraX11(); |
virtual ~ThemeServiceAuraX11(); |
// Overridden from ThemeService: |
- virtual bool ShouldInitWithNativeTheme() const OVERRIDE; |
- virtual void SetNativeTheme() OVERRIDE; |
+ virtual bool ShouldInitWithSystemTheme() const OVERRIDE; |
+ virtual void UseSystemTheme() OVERRIDE; |
virtual bool UsingDefaultTheme() const OVERRIDE; |
- virtual bool UsingNativeTheme() const OVERRIDE; |
+ virtual bool UsingSystemTheme() const OVERRIDE; |
- // Overridden from views::NativeThemeChangeObserver: |
- virtual void OnNativeThemeChanged() OVERRIDE; |
+ // Overridden from views::SystemThemeChangeObserver: |
+ virtual void OnSystemThemeChanged() OVERRIDE; |
private: |
DISALLOW_COPY_AND_ASSIGN(ThemeServiceAuraX11); |