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

Side by Side Diff: ash/display/display_manager.h

Issue 23620060: Try to enable software mirror mode in UI message loop after Init() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 7 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « ash/ash_switches.cc ('k') | ash/display/display_manager.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 ASH_DISPLAY_DISPLAY_MANAGER_H_ 5 #ifndef ASH_DISPLAY_DISPLAY_MANAGER_H_
6 #define ASH_DISPLAY_DISPLAY_MANAGER_H_ 6 #define ASH_DISPLAY_DISPLAY_MANAGER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 // of on a device. 210 // of on a device.
211 void AddRemoveDisplay(); 211 void AddRemoveDisplay();
212 void ToggleDisplayScaleFactor(); 212 void ToggleDisplayScaleFactor();
213 213
214 // SoftwareMirroringController override: 214 // SoftwareMirroringController override:
215 #if defined(OS_CHROMEOS) 215 #if defined(OS_CHROMEOS)
216 virtual void SetSoftwareMirroring(bool enabled) OVERRIDE; 216 virtual void SetSoftwareMirroring(bool enabled) OVERRIDE;
217 #else 217 #else
218 void SetSoftwareMirroring(bool enabled); 218 void SetSoftwareMirroring(bool enabled);
219 #endif 219 #endif
220 bool software_mirroring_enabled() const {
221 return software_mirroring_enabled_;
222 };
220 223
221 // Update the bounds of the display given by |display_id|. 224 // Update the bounds of the display given by |display_id|.
222 bool UpdateDisplayBounds(int64 display_id, 225 bool UpdateDisplayBounds(int64 display_id,
223 const gfx::Rect& new_bounds); 226 const gfx::Rect& new_bounds);
227
228 // Creates mirror window if the software mirror mode is enabled.
229 // This is used only for bootstrap.
230 void CreateMirrorWindowIfAny();
231
224 private: 232 private:
225 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, ConvertPoint); 233 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, ConvertPoint);
226 FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest, TestNativeDisplaysChanged); 234 FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest, TestNativeDisplaysChanged);
227 FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest, 235 FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest,
228 NativeDisplaysChangedAfterPrimaryChange); 236 NativeDisplaysChangedAfterPrimaryChange);
229 FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest, AutomaticOverscanInsets); 237 FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest, AutomaticOverscanInsets);
230 friend class ash::AcceleratorControllerTest; 238 friend class ash::AcceleratorControllerTest;
231 friend class test::DisplayManagerTestApi; 239 friend class test::DisplayManagerTestApi;
232 friend class test::SystemGestureEventFilterTest; 240 friend class test::SystemGestureEventFilterTest;
233 friend class DisplayManagerTest; 241 friend class DisplayManagerTest;
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 305
298 bool software_mirroring_enabled_; 306 bool software_mirroring_enabled_;
299 307
300 DISALLOW_COPY_AND_ASSIGN(DisplayManager); 308 DISALLOW_COPY_AND_ASSIGN(DisplayManager);
301 }; 309 };
302 310
303 } // namespace internal 311 } // namespace internal
304 } // namespace ash 312 } // namespace ash
305 313
306 #endif // ASH_DISPLAY_DISPLAY_MANAGER_H_ 314 #endif // ASH_DISPLAY_DISPLAY_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/ash_switches.cc ('k') | ash/display/display_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698