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

Side by Side Diff: ui/base/default_theme_provider.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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 unified diff | Download patch
« no previous file with comments | « ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h ('k') | ui/base/dragdrop/drag_utils.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 UI_BASE_DEFAULT_THEME_PROVIDER_H_ 5 #ifndef UI_BASE_DEFAULT_THEME_PROVIDER_H_
6 #define UI_BASE_DEFAULT_THEME_PROVIDER_H_ 6 #define UI_BASE_DEFAULT_THEME_PROVIDER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "ui/base/theme_provider.h" 12 #include "ui/base/theme_provider.h"
13 #include "ui/base/ui_base_export.h" 13 #include "ui/base/ui_base_export.h"
14 14
15 namespace ui { 15 namespace ui {
16 class ResourceBundle; 16 class ResourceBundle;
17 } 17 }
18 18
19 namespace ui { 19 namespace ui {
20 20
21 class UI_BASE_EXPORT DefaultThemeProvider : public ThemeProvider { 21 class UI_BASE_EXPORT DefaultThemeProvider : public ThemeProvider {
22 public: 22 public:
23 DefaultThemeProvider(); 23 DefaultThemeProvider();
24 virtual ~DefaultThemeProvider(); 24 virtual ~DefaultThemeProvider();
25 25
26 // Overridden from ui::ThemeProvider: 26 // Overridden from ui::ThemeProvider:
27 virtual bool UsingSystemTheme() const OVERRIDE; 27 virtual bool UsingSystemTheme() const override;
28 virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE; 28 virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const override;
29 virtual SkColor GetColor(int id) const OVERRIDE; 29 virtual SkColor GetColor(int id) const override;
30 virtual int GetDisplayProperty(int id) const OVERRIDE; 30 virtual int GetDisplayProperty(int id) const override;
31 virtual bool ShouldUseNativeFrame() const OVERRIDE; 31 virtual bool ShouldUseNativeFrame() const override;
32 virtual bool HasCustomImage(int id) const OVERRIDE; 32 virtual bool HasCustomImage(int id) const override;
33 virtual base::RefCountedMemory* GetRawData( 33 virtual base::RefCountedMemory* GetRawData(
34 int id, 34 int id,
35 ui::ScaleFactor scale_factor) const OVERRIDE; 35 ui::ScaleFactor scale_factor) const override;
36 36
37 #if defined(OS_MACOSX) 37 #if defined(OS_MACOSX)
38 virtual NSImage* GetNSImageNamed(int id) const OVERRIDE; 38 virtual NSImage* GetNSImageNamed(int id) const override;
39 virtual NSColor* GetNSImageColorNamed(int id) const OVERRIDE; 39 virtual NSColor* GetNSImageColorNamed(int id) const override;
40 virtual NSColor* GetNSColor(int id) const OVERRIDE; 40 virtual NSColor* GetNSColor(int id) const override;
41 virtual NSColor* GetNSColorTint(int id) const OVERRIDE; 41 virtual NSColor* GetNSColorTint(int id) const override;
42 virtual NSGradient* GetNSGradient(int id) const OVERRIDE; 42 virtual NSGradient* GetNSGradient(int id) const override;
43 #endif 43 #endif
44 44
45 private: 45 private:
46 DISALLOW_COPY_AND_ASSIGN(DefaultThemeProvider); 46 DISALLOW_COPY_AND_ASSIGN(DefaultThemeProvider);
47 }; 47 };
48 48
49 } // namespace ui 49 } // namespace ui
50 50
51 #endif // UI_BASE_DEFAULT_THEME_PROVIDER_H_ 51 #endif // UI_BASE_DEFAULT_THEME_PROVIDER_H_
OLDNEW
« no previous file with comments | « ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h ('k') | ui/base/dragdrop/drag_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698