Allow cert-popup for WebView guests.

chrome/browser/ui/views/certificate_selector.cc

 // Copyright 2015 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/ui/views/certificate_selector.h"
 
 #include <stddef.h>  // For size_t.
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/constrained_window/constrained_window_views.h"
+#include "components/guest_view/browser/guest_view_base.h"
+#include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/table_model.h"
 #include "ui/base/models/table_model_observer.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/table/table_view.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
@@ skipping 54 matching lines @@
       web_contents_(web_contents),
       table_(nullptr),
       view_cert_button_(nullptr) {
   CHECK(web_contents_);
 }
 
 CertificateSelector::~CertificateSelector() {
   table_->SetModel(nullptr);
 }
 
+// Static.

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

I think we usually just do:
  // static
No caps or period.

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

Done.

+bool CertificateSelector::CanShow(content::WebContents* web_contents) {
+  // Note: in the following call, if web_contents is not a guest, then it is
+  // just used as the return value.

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

Nit: This is a bit wordy. I would maybe phrase it as:
  // GetTopLevelWebContents returns |web_contents| if it is not a guest.

+  content::WebContents* top_level_web_contents =
+      guest_view::GuestViewBase::GetTopLevelWebContents(web_contents);
+  return web_modal::WebContentsModalDialogManager::FromWebContents(
+             top_level_web_contents) != nullptr;
+}
+
 void CertificateSelector::Show() {
   constrained_window::ShowWebModalDialogViews(this, web_contents_);
 
   // Select the first row automatically.  This must be done after the dialog has
   // been created.
   table_->Select(0);
 }
 
 void CertificateSelector::InitWithText(scoped_ptr<views::View> text_label) {
   views::GridLayout* const layout = views::GridLayout::CreatePanel(this);
@@ skipping 73 matching lines @@
 void CertificateSelector::OnSelectionChanged() {
   GetDialogClientView()->ok_button()->SetEnabled(GetSelectedCert() != nullptr);
 }
 
 void CertificateSelector::OnDoubleClick() {
   if (GetSelectedCert())
     GetDialogClientView()->AcceptWindow();
 }
 
 }  // namespace chrome