From 857f47cd6bcc7f948c9b5b21a5749b4bb1d24991 Mon Sep 17 00:00:00 2001
From: "kcwu@chromium.org"
 <kcwu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Sat, 17 May 2014 18:21:06 +0000
Subject: Fix HDCP in mirror mode.

BUG=chromium:371878
TEST=verified with pepper plugin manually

Review URL: https://codereview.chromium.org/284853002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271252 0039d316-1c4b-4281-b951-d872f2087c98
---
 ash/display/display_manager.cc | 4 ++++
 ash/display/display_manager.h  | 1 +
 2 files changed, 5 insertions(+)

(limited to 'ash')

diff --git a/ash/display/display_manager.cc b/ash/display/display_manager.cc
index 9feca52..9b96cd6 100644
--- a/ash/display/display_manager.cc
+++ b/ash/display/display_manager.cc
@@ -936,6 +936,10 @@ void DisplayManager::SetSoftwareMirroring(bool enabled) {
     return;
   SetSecondDisplayMode(enabled ? MIRRORING : EXTENDED);
 }
+
+bool DisplayManager::SoftwareMirroringEnabled() const {
+  return software_mirroring_enabled();
+}
 #endif
 
 void DisplayManager::SetSecondDisplayMode(SecondDisplayMode mode) {
diff --git a/ash/display/display_manager.h b/ash/display/display_manager.h
index fcbd7dd..afc6286 100644
--- a/ash/display/display_manager.h
+++ b/ash/display/display_manager.h
@@ -252,6 +252,7 @@ class ASH_EXPORT DisplayManager
   // SoftwareMirroringController override:
 #if defined(OS_CHROMEOS)
   virtual void SetSoftwareMirroring(bool enabled) OVERRIDE;
+  virtual bool SoftwareMirroringEnabled() const OVERRIDE;
 #endif
   bool software_mirroring_enabled() const {
     return second_display_mode_ == MIRRORING;
-- 
cgit v1.1