Index: ui/base/default_theme_provider.h |
diff --git a/ui/base/default_theme_provider.h b/ui/base/default_theme_provider.h |
index 0fe64d117fda10db973755f185a81dd888efad68..173442deaa246cd58a08a14aa6ee332b342d89c6 100644 |
--- a/ui/base/default_theme_provider.h |
+++ b/ui/base/default_theme_provider.h |
@@ -21,25 +21,24 @@ namespace ui { |
class UI_BASE_EXPORT DefaultThemeProvider : public ThemeProvider { |
public: |
DefaultThemeProvider(); |
- virtual ~DefaultThemeProvider(); |
+ ~DefaultThemeProvider() override; |
// Overridden from ui::ThemeProvider: |
- virtual bool UsingSystemTheme() const override; |
- virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const override; |
- virtual SkColor GetColor(int id) const override; |
- virtual int GetDisplayProperty(int id) const override; |
- virtual bool ShouldUseNativeFrame() const override; |
- virtual bool HasCustomImage(int id) const override; |
- virtual base::RefCountedMemory* GetRawData( |
- int id, |
- ui::ScaleFactor scale_factor) const override; |
+ bool UsingSystemTheme() const override; |
+ gfx::ImageSkia* GetImageSkiaNamed(int id) const override; |
+ SkColor GetColor(int id) const override; |
+ int GetDisplayProperty(int id) const override; |
+ bool ShouldUseNativeFrame() const override; |
+ bool HasCustomImage(int id) const override; |
+ base::RefCountedMemory* GetRawData(int id, ui::ScaleFactor scale_factor) |
+ const override; |
#if defined(OS_MACOSX) |
- virtual NSImage* GetNSImageNamed(int id) const override; |
- virtual NSColor* GetNSImageColorNamed(int id) const override; |
- virtual NSColor* GetNSColor(int id) const override; |
- virtual NSColor* GetNSColorTint(int id) const override; |
- virtual NSGradient* GetNSGradient(int id) const override; |
+ NSImage* GetNSImageNamed(int id) const override; |
+ NSColor* GetNSImageColorNamed(int id) const override; |
+ NSColor* GetNSColor(int id) const override; |
+ NSColor* GetNSColorTint(int id) const override; |
+ NSGradient* GetNSGradient(int id) const override; |
#endif |
private: |