Merge 271252 "Fix HDCP in mirror mode."

ui/display/chromeos/display_configurator.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_
 #define UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 76 matching lines @@
                                            gfx::Size* size) const = 0;
   };
 
   // Interface for classes that implement software based mirroring.
   class SoftwareMirroringController {
    public:
     virtual ~SoftwareMirroringController() {}
 
     // Called when the hardware mirroring failed.
     virtual void SetSoftwareMirroring(bool enabled) = 0;
+    virtual bool SoftwareMirroringEnabled() const = 0;
   };
 
   class TouchscreenDelegate {
    public:
     virtual ~TouchscreenDelegate() {}
 
     // Searches for touchscreens among input devices,
     // and tries to match them up to screens in |displays|.
     // |displays| is an array of detected screens.
     // If a touchscreen with same resolution as a display's native mode
@@ skipping 207 matching lines @@
 
   // Returns the display state that should be used with |cached_displays_| while
   // in |power_state|.
   MultipleDisplayState ChooseDisplayState(
       chromeos::DisplayPowerState power_state) const;
 
   // Returns the ratio between mirrored mode area and native mode area:
   // (mirror_mode_width * mirrow_mode_height) / (native_width * native_height)
   float GetMirroredDisplayAreaRatio(const DisplayState& display);
 
+  // Returns true if in either hardware or software mirroring mode.
+  bool IsMirroring() const;
+
   // Applies display protections according to requests.
   bool ApplyProtections(const ContentProtections& requests);
 
   StateController* state_controller_;
   SoftwareMirroringController* mirroring_controller_;
   scoped_ptr<NativeDisplayDelegate> native_display_delegate_;
   scoped_ptr<TouchscreenDelegate> touchscreen_delegate_;
 
   // Used to enable modes which rely on panel fitting.
   bool is_panel_fitting_enabled_;
@@ skipping 36 matching lines @@
 
   // Display protection requests of each client.
   ProtectionRequests client_protection_requests_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayConfigurator);
 };
 
 }  // namespace ui
 
 #endif  // UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_