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

Side by Side Diff: ui/ozone/common/native_display_delegate_ozone.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/ozone/common/display_snapshot_proxy.h ('k') | ui/ozone/demo/ozone_demo.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_OZONE_COMMON_NATIVE_DISPLAY_DELEGATE_OZONE_H_ 5 #ifndef UI_OZONE_COMMON_NATIVE_DISPLAY_DELEGATE_OZONE_H_
6 #define UI_OZONE_COMMON_NATIVE_DISPLAY_DELEGATE_OZONE_H_ 6 #define UI_OZONE_COMMON_NATIVE_DISPLAY_DELEGATE_OZONE_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "ui/display/types/native_display_delegate.h" 9 #include "ui/display/types/native_display_delegate.h"
10 10
11 namespace ui { 11 namespace ui {
12 12
13 class NativeDisplayDelegateOzone : public NativeDisplayDelegate { 13 class NativeDisplayDelegateOzone : public NativeDisplayDelegate {
14 public: 14 public:
15 NativeDisplayDelegateOzone(); 15 NativeDisplayDelegateOzone();
16 virtual ~NativeDisplayDelegateOzone(); 16 virtual ~NativeDisplayDelegateOzone();
17 17
18 // NativeDisplayDelegate overrides: 18 // NativeDisplayDelegate overrides:
19 virtual void Initialize() OVERRIDE; 19 virtual void Initialize() override;
20 virtual void GrabServer() OVERRIDE; 20 virtual void GrabServer() override;
21 virtual void UngrabServer() OVERRIDE; 21 virtual void UngrabServer() override;
22 virtual void SyncWithServer() OVERRIDE; 22 virtual void SyncWithServer() override;
23 virtual void SetBackgroundColor(uint32_t color_argb) OVERRIDE; 23 virtual void SetBackgroundColor(uint32_t color_argb) override;
24 virtual void ForceDPMSOn() OVERRIDE; 24 virtual void ForceDPMSOn() override;
25 virtual std::vector<ui::DisplaySnapshot*> GetDisplays() OVERRIDE; 25 virtual std::vector<ui::DisplaySnapshot*> GetDisplays() override;
26 virtual void AddMode(const ui::DisplaySnapshot& output, 26 virtual void AddMode(const ui::DisplaySnapshot& output,
27 const ui::DisplayMode* mode) OVERRIDE; 27 const ui::DisplayMode* mode) override;
28 virtual bool Configure(const ui::DisplaySnapshot& output, 28 virtual bool Configure(const ui::DisplaySnapshot& output,
29 const ui::DisplayMode* mode, 29 const ui::DisplayMode* mode,
30 const gfx::Point& origin) OVERRIDE; 30 const gfx::Point& origin) override;
31 virtual void CreateFrameBuffer(const gfx::Size& size) OVERRIDE; 31 virtual void CreateFrameBuffer(const gfx::Size& size) override;
32 virtual bool GetHDCPState(const ui::DisplaySnapshot& output, 32 virtual bool GetHDCPState(const ui::DisplaySnapshot& output,
33 ui::HDCPState* state) OVERRIDE; 33 ui::HDCPState* state) override;
34 virtual bool SetHDCPState(const ui::DisplaySnapshot& output, 34 virtual bool SetHDCPState(const ui::DisplaySnapshot& output,
35 ui::HDCPState state) OVERRIDE; 35 ui::HDCPState state) override;
36 virtual std::vector<ui::ColorCalibrationProfile> 36 virtual std::vector<ui::ColorCalibrationProfile>
37 GetAvailableColorCalibrationProfiles( 37 GetAvailableColorCalibrationProfiles(
38 const ui::DisplaySnapshot& output) OVERRIDE; 38 const ui::DisplaySnapshot& output) override;
39 virtual bool SetColorCalibrationProfile( 39 virtual bool SetColorCalibrationProfile(
40 const ui::DisplaySnapshot& output, 40 const ui::DisplaySnapshot& output,
41 ui::ColorCalibrationProfile new_profile) OVERRIDE; 41 ui::ColorCalibrationProfile new_profile) override;
42 virtual void AddObserver(NativeDisplayObserver* observer) OVERRIDE; 42 virtual void AddObserver(NativeDisplayObserver* observer) override;
43 virtual void RemoveObserver(NativeDisplayObserver* observer) OVERRIDE; 43 virtual void RemoveObserver(NativeDisplayObserver* observer) override;
44 44
45 private: 45 private:
46 DISALLOW_COPY_AND_ASSIGN(NativeDisplayDelegateOzone); 46 DISALLOW_COPY_AND_ASSIGN(NativeDisplayDelegateOzone);
47 }; 47 };
48 48
49 } // namespace ui 49 } // namespace ui
50 50
51 #endif // UI_OZONE_COMMON_NATIVE_DISPLAY_DELEGATE_OZONE_H_ 51 #endif // UI_OZONE_COMMON_NATIVE_DISPLAY_DELEGATE_OZONE_H_
OLDNEW
« no previous file with comments | « ui/ozone/common/display_snapshot_proxy.h ('k') | ui/ozone/demo/ozone_demo.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698