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

Side by Side Diff: ui/display/chromeos/x11/native_display_delegate_x11.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
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_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_ 5 #ifndef UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_
6 #define UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_ 6 #define UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 virtual const std::vector<DisplaySnapshot*>& GetCachedDisplays() const = 0; 61 virtual const std::vector<DisplaySnapshot*>& GetCachedDisplays() const = 0;
62 62
63 // Notify |observers_| that a change in configuration has occurred. 63 // Notify |observers_| that a change in configuration has occurred.
64 virtual void NotifyDisplayObservers() = 0; 64 virtual void NotifyDisplayObservers() = 0;
65 }; 65 };
66 66
67 NativeDisplayDelegateX11(); 67 NativeDisplayDelegateX11();
68 virtual ~NativeDisplayDelegateX11(); 68 virtual ~NativeDisplayDelegateX11();
69 69
70 // NativeDisplayDelegate overrides: 70 // NativeDisplayDelegate overrides:
71 virtual void Initialize() OVERRIDE; 71 virtual void Initialize() override;
72 virtual void GrabServer() OVERRIDE; 72 virtual void GrabServer() override;
73 virtual void UngrabServer() OVERRIDE; 73 virtual void UngrabServer() override;
74 virtual void SyncWithServer() OVERRIDE; 74 virtual void SyncWithServer() override;
75 virtual void SetBackgroundColor(uint32_t color_argb) OVERRIDE; 75 virtual void SetBackgroundColor(uint32_t color_argb) override;
76 virtual void ForceDPMSOn() OVERRIDE; 76 virtual void ForceDPMSOn() override;
77 virtual std::vector<DisplaySnapshot*> GetDisplays() OVERRIDE; 77 virtual std::vector<DisplaySnapshot*> GetDisplays() override;
78 virtual void AddMode(const DisplaySnapshot& output, 78 virtual void AddMode(const DisplaySnapshot& output,
79 const DisplayMode* mode) OVERRIDE; 79 const DisplayMode* mode) override;
80 virtual bool Configure(const DisplaySnapshot& output, 80 virtual bool Configure(const DisplaySnapshot& output,
81 const DisplayMode* mode, 81 const DisplayMode* mode,
82 const gfx::Point& origin) OVERRIDE; 82 const gfx::Point& origin) override;
83 virtual void CreateFrameBuffer(const gfx::Size& size) OVERRIDE; 83 virtual void CreateFrameBuffer(const gfx::Size& size) override;
84 virtual bool GetHDCPState(const DisplaySnapshot& output, 84 virtual bool GetHDCPState(const DisplaySnapshot& output,
85 HDCPState* state) OVERRIDE; 85 HDCPState* state) override;
86 virtual bool SetHDCPState(const DisplaySnapshot& output, 86 virtual bool SetHDCPState(const DisplaySnapshot& output,
87 HDCPState state) OVERRIDE; 87 HDCPState state) override;
88 virtual std::vector<ColorCalibrationProfile> 88 virtual std::vector<ColorCalibrationProfile>
89 GetAvailableColorCalibrationProfiles( 89 GetAvailableColorCalibrationProfiles(
90 const DisplaySnapshot& output) OVERRIDE; 90 const DisplaySnapshot& output) override;
91 virtual bool SetColorCalibrationProfile( 91 virtual bool SetColorCalibrationProfile(
92 const DisplaySnapshot& output, 92 const DisplaySnapshot& output,
93 ColorCalibrationProfile new_profile) OVERRIDE; 93 ColorCalibrationProfile new_profile) override;
94 virtual void AddObserver(NativeDisplayObserver* observer) OVERRIDE; 94 virtual void AddObserver(NativeDisplayObserver* observer) override;
95 virtual void RemoveObserver(NativeDisplayObserver* observer) OVERRIDE; 95 virtual void RemoveObserver(NativeDisplayObserver* observer) override;
96 96
97 private: 97 private:
98 class HelperDelegateX11; 98 class HelperDelegateX11;
99 99
100 // Parses all the modes made available by |screen_|. 100 // Parses all the modes made available by |screen_|.
101 void InitModes(); 101 void InitModes();
102 102
103 // Helper method for GetOutputs() that returns an OutputSnapshot struct based 103 // Helper method for GetOutputs() that returns an OutputSnapshot struct based
104 // on the passed-in information. 104 // on the passed-in information.
105 DisplaySnapshotX11* InitDisplaySnapshot(RROutput id, 105 DisplaySnapshotX11* InitDisplaySnapshot(RROutput id,
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 153
154 // A background color used during boot time + multi displays. 154 // A background color used during boot time + multi displays.
155 uint32_t background_color_argb_; 155 uint32_t background_color_argb_;
156 156
157 DISALLOW_COPY_AND_ASSIGN(NativeDisplayDelegateX11); 157 DISALLOW_COPY_AND_ASSIGN(NativeDisplayDelegateX11);
158 }; 158 };
159 159
160 } // namespace ui 160 } // namespace ui
161 161
162 #endif // UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_ 162 #endif // UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_
OLDNEW
« no previous file with comments | « ui/display/chromeos/x11/display_snapshot_x11.h ('k') | ui/display/chromeos/x11/native_display_delegate_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698