Allow cert-popup for WebView guests.

chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm

 // Copyright (c) 2012 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.
 
 #import "chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.h"
 
 #import <SecurityInterface/SFChooseIdentityPanel.h>
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ssl/ssl_client_auth_observer.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"
 #include "chrome/grit/generated_resources.h"
+#include "components/guest_view/browser/guest_view_base.h"
 #include "components/web_modal/popup_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/client_certificate_delegate.h"
 #include "content/public/browser/web_contents.h"
 #include "net/cert/x509_certificate.h"
 #include "net/cert/x509_util_mac.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "ui/base/cocoa/window_size_constants.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
@@ skipping 46 matching lines @@
 namespace chrome {
 
 void ShowSSLClientCertificateSelector(
     content::WebContents* contents,
     net::SSLCertRequestInfo* cert_request_info,
     scoped_ptr<content::ClientCertificateDelegate> delegate) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // Not all WebContentses can show modal dialogs.
   //
+  // Use GetTopLevelWebContents() below to find top-level embedder if |contents|

[davidben, 2015/07/15 21:30:13]

Nit: to find the top-level embedder

[wjmaclean, 2015/07/15 23:06:24]

Done.

+  // happens to be a guest. It returns contents if it's not a guest.

[davidben, 2015/07/15 21:30:13]

Nit: contents -> |contents|. Also this is confusing with "It" and "it's". How
about:

  Use the top-level embedder if |contents| is a guest. GetTopLevelWebContents()
will return |contents| otherwise.

[wjmaclean, 2015/07/15 23:06:24]

Done.

   // TODO(davidben): Move this hook to the WebContentsDelegate and only try to
   // show a dialog in Browser's implementation. https://crbug.com/456255
-  if (web_modal::PopupManager::FromWebContents(contents) == nullptr)
+  if (web_modal::PopupManager::FromWebContents(
+          guest_view::GuestViewBase::GetTopLevelWebContents(contents)) ==
+      nullptr)
     return;
 
   // The dialog manages its own lifetime.
   SSLClientCertificateSelectorCocoa* selector =
       [[SSLClientCertificateSelectorCocoa alloc]
           initWithBrowserContext:contents->GetBrowserContext()
                  certRequestInfo:cert_request_info
                         delegate:delegate.Pass()];
   [selector displayForWebContents:contents];
 }
@@ skipping 160 matching lines @@
 }
 
 - (void)onConstrainedWindowClosed {
   observer_->StopObserving();
   panel_.reset();
   constrainedWindow_.reset();
   [self release];
 }
 
 @end