media: Invoke PlatformVerificationDialog from ProtectedMediaIdentifierPermissionContext.

chrome/browser/chromeos/attestation/platform_verification_dialog.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/chromeos/attestation/platform_verification_dialog.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_navigator.h"
@@ skipping 19 matching lines @@
 namespace chromeos {
 namespace attestation {
 
 namespace {
 
 const int kDialogMaxWidthInPixel = 400;
 
 }  // namespace
 
 // static
-void PlatformVerificationDialog::ShowDialog(
+views::Widget* PlatformVerificationDialog::ShowDialog(
     content::WebContents* web_contents,
+    const GURL& requesting_origin,
     const PlatformVerificationFlow::Delegate::ConsentCallback& callback) {
-  GURL url = web_contents->GetLastCommittedURL();
   // In the case of an extension or hosted app, the origin of the request is
   // best described by the extension / app name.
   const extensions::Extension* extension =
-      extensions::ExtensionRegistry::Get(web_contents->GetBrowserContext())->
-          enabled_extensions().GetExtensionOrAppByURL(url);
-  std::string origin = extension ? extension->name() : url.GetOrigin().spec();
+      extensions::ExtensionRegistry::Get(web_contents->GetBrowserContext())
+          ->enabled_extensions()
+          .GetExtensionOrAppByURL(web_contents->GetLastCommittedURL());

[Darren Krahn, 2015/02/05 16:40:44]

Should we use requesting_origin here too?

[xhwang, 2015/02/05 18:09:48]

I am not sure. If the requesting_origin is different from the last committed URL
this call will fail? +mukai for insights.

[xhwang, 2015/02/05 22:02:18]

Confirmed. GetExtensionOrAppByURL only expects chrome-extension://<id>/* urls.
So it's really the true frame's url instead of the requesting origin.

That said, we should correctly handle the case where the request is from an
iframe within the extension. I added TODO and bug for this.

+
+  std::string origin = extension ? extension->name() : requesting_origin.spec();
 
   PlatformVerificationDialog* dialog = new PlatformVerificationDialog(
       web_contents,
       base::UTF8ToUTF16(origin),
       callback);
 
   // Sets up the dialog widget to be shown.
   web_modal::PopupManager* popup_manager =
       web_modal::PopupManager::FromWebContents(web_contents);
   DCHECK(popup_manager);
   views::Widget* widget = views::DialogDelegate::CreateDialogWidget(
       dialog, NULL, popup_manager->GetHostView());
   popup_manager->ShowModalDialog(widget->GetNativeView(), web_contents);
+
+  return widget;
 }
 
 PlatformVerificationDialog::~PlatformVerificationDialog() {
 }
 
 PlatformVerificationDialog::PlatformVerificationDialog(
     content::WebContents* web_contents,
     const base::string16& domain,
     const PlatformVerificationFlow::Delegate::ConsentCallback& callback)
     : content::WebContentsObserver(web_contents),
@@ skipping 75 matching lines @@
 void PlatformVerificationDialog::DidStartNavigationToPendingEntry(
     const GURL& url,
     content::NavigationController::ReloadType reload_type) {
   views::Widget* widget = GetWidget();
   if (widget)
     widget->Close();
 }
 
 }  // namespace attestation
 }  // namespace chromeos