Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CHROME_BROWSER_THEMES_THEME_SERVICE_AURAX11_H_ | 5 #ifndef CHROME_BROWSER_THEMES_THEME_SERVICE_AURAX11_H_ |
| 6 #define CHROME_BROWSER_THEMES_THEME_SERVICE_AURAX11_H_ | 6 #define CHROME_BROWSER_THEMES_THEME_SERVICE_AURAX11_H_ |
| 7 | 7 |
| 8 #include "chrome/browser/themes/theme_service.h" | 8 #include "chrome/browser/themes/theme_service.h" |
| 9 #include "ui/views/linux_ui/native_theme_change_observer.h" | 9 #include "ui/views/linux_ui/system_theme_change_observer.h" |
| 10 | 10 |
| 11 // A subclass of ThemeService that manages the CustomThemeSupplier which | 11 // A subclass of ThemeService that manages the CustomThemeSupplier which |
| 12 // provides the native X11 theme. | 12 // provides the native X11 theme. |
| 13 class ThemeServiceAuraX11 : public ThemeService, | 13 class ThemeServiceAuraX11 : public ThemeService, |
| 14 public views::NativeThemeChangeObserver { | 14 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
| |
| 15 public: | 15 public: |
| 16 ThemeServiceAuraX11(); | 16 ThemeServiceAuraX11(); |
| 17 virtual ~ThemeServiceAuraX11(); | 17 virtual ~ThemeServiceAuraX11(); |
| 18 | 18 |
| 19 // Overridden from ThemeService: | 19 // Overridden from ThemeService: |
| 20 virtual bool ShouldInitWithNativeTheme() const OVERRIDE; | 20 virtual bool ShouldInitWithSystemTheme() const OVERRIDE; |
| 21 virtual void SetNativeTheme() OVERRIDE; | 21 virtual void UseSystemTheme() OVERRIDE; |
| 22 virtual bool UsingDefaultTheme() const OVERRIDE; | 22 virtual bool UsingDefaultTheme() const OVERRIDE; |
| 23 virtual bool UsingNativeTheme() const OVERRIDE; | 23 virtual bool UsingSystemTheme() const OVERRIDE; |
| 24 | 24 |
| 25 // Overridden from views::NativeThemeChangeObserver: | 25 // Overridden from views::SystemThemeChangeObserver: |
| 26 virtual void OnNativeThemeChanged() OVERRIDE; | 26 virtual void OnSystemThemeChanged() OVERRIDE; |
| 27 | 27 |
| 28 private: | 28 private: |
| 29 DISALLOW_COPY_AND_ASSIGN(ThemeServiceAuraX11); | 29 DISALLOW_COPY_AND_ASSIGN(ThemeServiceAuraX11); |
| 30 }; | 30 }; |
| 31 | 31 |
| 32 #endif // CHROME_BROWSER_THEMES_THEME_SERVICE_AURAX11_H_ | 32 #endif // CHROME_BROWSER_THEMES_THEME_SERVICE_AURAX11_H_ |
| OLD | NEW |