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

Side by Side Diff: ui/display/chromeos/x11/native_display_delegate_x11.h

Issue 796263002: Remove synchronous GetDisplays() and Configure() from NativeDisplayDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@async-refactor5
Patch Set: Removed deprecated calls from TestNativeDisplayDelegate and update the ExternalControl test Created 6 years 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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 70
71 // NativeDisplayDelegate overrides: 71 // NativeDisplayDelegate overrides:
72 virtual void Initialize() override; 72 virtual void Initialize() override;
73 virtual void GrabServer() override; 73 virtual void GrabServer() override;
74 virtual void UngrabServer() override; 74 virtual void UngrabServer() override;
75 virtual bool TakeDisplayControl() override; 75 virtual bool TakeDisplayControl() override;
76 virtual bool RelinquishDisplayControl() override; 76 virtual bool RelinquishDisplayControl() override;
77 virtual void SyncWithServer() override; 77 virtual void SyncWithServer() override;
78 virtual void SetBackgroundColor(uint32_t color_argb) override; 78 virtual void SetBackgroundColor(uint32_t color_argb) override;
79 virtual void ForceDPMSOn() override; 79 virtual void ForceDPMSOn() override;
80 virtual std::vector<DisplaySnapshot*> GetDisplays() override;
81 virtual void GetDisplays(const GetDisplaysCallback& callback) override; 80 virtual void GetDisplays(const GetDisplaysCallback& callback) override;
82 virtual void AddMode(const DisplaySnapshot& output, 81 virtual void AddMode(const DisplaySnapshot& output,
83 const DisplayMode* mode) override; 82 const DisplayMode* mode) override;
84 virtual bool Configure(const DisplaySnapshot& output,
85 const DisplayMode* mode,
86 const gfx::Point& origin) override;
87 virtual void Configure(const DisplaySnapshot& output, 83 virtual void Configure(const DisplaySnapshot& output,
88 const DisplayMode* mode, 84 const DisplayMode* mode,
89 const gfx::Point& origin, 85 const gfx::Point& origin,
90 const ConfigureCallback& callback) override; 86 const ConfigureCallback& callback) override;
91 virtual void CreateFrameBuffer(const gfx::Size& size) override; 87 virtual void CreateFrameBuffer(const gfx::Size& size) override;
92 virtual bool GetHDCPState(const DisplaySnapshot& output, 88 virtual bool GetHDCPState(const DisplaySnapshot& output,
93 HDCPState* state) override; 89 HDCPState* state) override;
94 virtual bool SetHDCPState(const DisplaySnapshot& output, 90 virtual bool SetHDCPState(const DisplaySnapshot& output,
95 HDCPState state) override; 91 HDCPState state) override;
96 virtual std::vector<ColorCalibrationProfile> 92 virtual std::vector<ColorCalibrationProfile>
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 157
162 // A background color used during boot time + multi displays. 158 // A background color used during boot time + multi displays.
163 uint32_t background_color_argb_; 159 uint32_t background_color_argb_;
164 160
165 DISALLOW_COPY_AND_ASSIGN(NativeDisplayDelegateX11); 161 DISALLOW_COPY_AND_ASSIGN(NativeDisplayDelegateX11);
166 }; 162 };
167 163
168 } // namespace ui 164 } // namespace ui
169 165
170 #endif // UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_ 166 #endif // UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_
OLDNEW
« no previous file with comments | « ui/display/chromeos/test/test_native_display_delegate.cc ('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