[1/8] Prepare Pepper for async output protection configuration

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 24 matching lines @@
 class UpdateDisplayConfigurationTask;
 
 // This class interacts directly with the system display configurator.
 class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver {
  public:
   typedef uint64_t ContentProtectionClientId;
   static const ContentProtectionClientId kInvalidClientId = 0;
 
   typedef base::Callback<void(bool)> ConfigurationCallback;
 
+  typedef base::Callback<void(bool /* success */)> EnableProtectionCallback;
+
+  // |link_mask| is the type of connected display links, which is a bitmask of
+  // DisplayConnectionType values. |protection_mask| is the desired protection
+  // methods, which is a bitmask of the ContentProtectionMethod values.
+  typedef base::Callback<void(bool /* success */,
+                              uint32_t /* link_mask */,
+                              uint32_t /* protection_mask */)>

[oshima, 2015/04/02 16:00:51]

It may be better to define struct instead of using native types.

[dnicoara, 2015/04/14 20:15:43]

Done.

+      QueryProtectionCallback;
+
   typedef std::vector<DisplaySnapshot*> DisplayStateList;
 
   class Observer {
    public:
     virtual ~Observer() {}
 
     // Called after the display mode has been changed. |display| contains the
     // just-applied configuration. Note that the X server is no longer grabbed
     // when this method is called, so the actual configuration could've changed
     // already.
@@ skipping 178 matching lines @@
   // suspended.
   void ResumeDisplays();
 
   // Registers a client for display protection and requests a client id. Returns
   // 0 if requesting failed.
   ContentProtectionClientId RegisterContentProtectionClient();
 
   // Unregisters the client.
   void UnregisterContentProtectionClient(ContentProtectionClientId client_id);
 
-  // Queries link status and protection status.
-  // |link_mask| is the type of connected display links, which is a bitmask of
-  // DisplayConnectionType values. |protection_mask| is the desired protection
-  // methods, which is a bitmask of the ContentProtectionMethod values.
-  // Returns true on success.
-  bool QueryContentProtectionStatus(ContentProtectionClientId client_id,
+  // Queries link status and protection status. |callback| is used to respond
+  // to the query.
+  void QueryContentProtectionStatus(ContentProtectionClientId client_id,
                                     int64_t display_id,
-                                    uint32_t* link_mask,
-                                    uint32_t* protection_mask);
+                                    const QueryProtectionCallback& callback);
 
   // Requests the desired protection methods.
   // |protection_mask| is the desired protection methods, which is a bitmask
   // of the ContentProtectionMethod values.
   // Returns true when the protection request has been made.
-  bool EnableContentProtection(ContentProtectionClientId client_id,
+  void EnableContentProtection(ContentProtectionClientId client_id,
                                int64_t display_id,
-                               uint32_t desired_protection_mask);
+                               uint32_t protection_mask,
+                               const EnableProtectionCallback& callback);
 
   // Checks the available color profiles for |display_id| and fills the result
   // into |profiles|.
   std::vector<ui::ColorCalibrationProfile> GetAvailableColorCalibrationProfiles(
       int64_t display_id);
 
   // Updates the color calibration to |new_profile|.
   bool SetColorCalibrationProfile(int64_t display_id,
                                   ui::ColorCalibrationProfile new_profile);
 
@@ skipping 132 matching lines @@
 
   // This must be the last variable.
   base::WeakPtrFactory<DisplayConfigurator> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayConfigurator);
 };
 
 }  // namespace ui
 
 #endif  // UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_