Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / media / protected_media_identifier_permission_context.cc

diff --git a/src/chrome/browser/media/protected_media_identifier_permission_context.cc b/src/chrome/browser/media/protected_media_identifier_permission_context.cc
index 258d817..74067da 100644 (file)
--- a/src/chrome/browser/media/protected_media_identifier_permission_context.cc
+++ b/src/chrome/browser/media/protected_media_identifier_permission_context.cc
@@ -14,16 +14,16 @@
 #include "chrome/browser/content_settings/permission_request_id.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/suggest_permission_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_util.h"
-#include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
+#include "extensions/browser/extension_system.h"
 #include "extensions/browser/view_type_utils.h"
+#include "extensions/common/extension.h"
 
 using extensions::APIPermission;
 
@@ -43,6 +43,8 @@ void ProtectedMediaIdentifierPermissionContext::
     RequestProtectedMediaIdentifierPermission(
         int render_process_id,
         int render_view_id,
+        int bridge_id,
+        int group_id,
         const GURL& requesting_frame,
         const base::Callback<void(bool)>& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
@@ -51,7 +53,8 @@ void ProtectedMediaIdentifierPermissionContext::
 
   content::WebContents* web_contents =
       tab_util::GetWebContentsByID(render_process_id, render_view_id);
-  const PermissionRequestID id(render_process_id, render_view_id, 0);
+  const PermissionRequestID id(
+      render_process_id, render_view_id, bridge_id, group_id);
 
   if (extensions::GetViewType(web_contents) !=
       extensions::VIEW_TYPE_TAB_CONTENTS) {
@@ -79,12 +82,8 @@ void ProtectedMediaIdentifierPermissionContext::
 }
 
 void ProtectedMediaIdentifierPermissionContext::
-    CancelProtectedMediaIdentifierPermissionRequest(
-        int render_process_id,
-        int render_view_id,
-        const GURL& requesting_frame) {
-  CancelPendingInfoBarRequest(
-      PermissionRequestID(render_process_id, render_view_id, 0));
+    CancelProtectedMediaIdentifierPermissionRequests(int group_id) {
+  CancelPendingInfobarRequests(group_id);
 }
 
 void ProtectedMediaIdentifierPermissionContext::DecidePermission(
@@ -122,13 +121,13 @@ void ProtectedMediaIdentifierPermissionContext::DecidePermission(
           id,
           requesting_frame,
           embedder,
+          std::string(),
           base::Bind(&ProtectedMediaIdentifierPermissionContext::
                           NotifyPermissionSet,
                      base::Unretained(this),
                      id,
                      requesting_frame,
                      callback));
-      rvh->DisableFullscreenEncryptedMediaPlayback();
       break;
     default:
       NOTREACHED();
@@ -186,20 +185,20 @@ PermissionQueueController*
 }
 
 void
-ProtectedMediaIdentifierPermissionContext::CancelPendingInfoBarRequest(
-    const PermissionRequestID& id) {
+ProtectedMediaIdentifierPermissionContext::CancelPendingInfobarRequests(
+    int group_id) {
   if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
     content::BrowserThread::PostTask(
         content::BrowserThread::UI,
         FROM_HERE,
         base::Bind(&ProtectedMediaIdentifierPermissionContext::
-                        CancelPendingInfoBarRequest,
+                        CancelPendingInfobarRequests,
                    this,
-                   id));
+                   group_id));
     return;
   }
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   if (shutting_down_)
     return;
-  QueueController()->CancelInfoBarRequest(id);
+  QueueController()->CancelInfoBarRequests(group_id);
 }