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

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

Issue 284853002: Fix HDCP in mirror mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix unittest build Created 6 years, 7 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 | « no previous file | 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 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 void SetMirrorMode(bool mirrored); 245 void SetMirrorMode(bool mirrored);
246 246
247 // Used to emulate display change when run in a desktop environment instead 247 // Used to emulate display change when run in a desktop environment instead
248 // of on a device. 248 // of on a device.
249 void AddRemoveDisplay(); 249 void AddRemoveDisplay();
250 void ToggleDisplayScaleFactor(); 250 void ToggleDisplayScaleFactor();
251 251
252 // SoftwareMirroringController override: 252 // SoftwareMirroringController override:
253 #if defined(OS_CHROMEOS) 253 #if defined(OS_CHROMEOS)
254 virtual void SetSoftwareMirroring(bool enabled) OVERRIDE; 254 virtual void SetSoftwareMirroring(bool enabled) OVERRIDE;
255 virtual bool SoftwareMirroringEnabled() const OVERRIDE;
255 #endif 256 #endif
256 bool software_mirroring_enabled() const { 257 bool software_mirroring_enabled() const {
257 return second_display_mode_ == MIRRORING; 258 return second_display_mode_ == MIRRORING;
258 }; 259 };
259 260
260 bool virtual_keyboard_root_window_enabled() const { 261 bool virtual_keyboard_root_window_enabled() const {
261 return second_display_mode_ == VIRTUAL_KEYBOARD; 262 return second_display_mode_ == VIRTUAL_KEYBOARD;
262 }; 263 };
263 264
264 // Sets/gets second display mode. 265 // Sets/gets second display mode.
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 SecondDisplayMode second_display_mode_; 361 SecondDisplayMode second_display_mode_;
361 int64 mirrored_display_id_; 362 int64 mirrored_display_id_;
362 gfx::Display non_desktop_display_; 363 gfx::Display non_desktop_display_;
363 364
364 DISALLOW_COPY_AND_ASSIGN(DisplayManager); 365 DISALLOW_COPY_AND_ASSIGN(DisplayManager);
365 }; 366 };
366 367
367 } // namespace ash 368 } // namespace ash
368 369
369 #endif // ASH_DISPLAY_DISPLAY_MANAGER_H_ 370 #endif // ASH_DISPLAY_DISPLAY_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/display/display_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698