Reland Fix Views web-modal dialog widget creation.

chrome/browser/chromeos/login/ui/captive_portal_window_proxy.cc

 // 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.
 
 #include "chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h"
 
 #include "chrome/browser/chromeos/login/ui/captive_portal_view.h"
 #include "chrome/browser/chromeos/login/ui/proxy_settings_dialog.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
 #include "ui/views/widget/widget.h"
 
-using web_modal::WebContentsModalDialogManager;
-using web_modal::WebContentsModalDialogManagerDelegate;
+namespace {
+// The captive portal dialog is system-modal, but uses the web-content-modal
+// dialog manager (odd) and requires this atypical dialog widget initialization.
+views::Widget* CreateWindowAsFramelessChild(views::WidgetDelegate* delegate,
+                                            gfx::NativeView parent) {
+  views::Widget* widget = new views::Widget;
+
+  views::Widget::InitParams params;
+  params.delegate = delegate;
+  params.child = true;
+  params.parent = parent;
+  params.remove_standard_frame = true;
+  params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
+
+  widget->Init(params);
+  return widget;
+}
+
+}  // namespace
 
 namespace chromeos {
 
 CaptivePortalWindowProxy::CaptivePortalWindowProxy(
     Delegate* delegate,
     content::WebContents* web_contents)
     : delegate_(delegate),
       widget_(NULL),
       web_contents_(web_contents),
       captive_portal_view_for_testing_(NULL) {
@@ skipping 20 matching lines @@
     // ProxySettingsDialog is being shown, don't cover it.
     Close();
     return;
   }
 
   if (GetState() == STATE_DISPLAYED)  // Dialog is already shown, do nothing.
     return;
 
   InitCaptivePortalView();
 
-  CaptivePortalView* captive_portal_view = captive_portal_view_.release();
-  WebContentsModalDialogManager* web_contents_modal_dialog_manager =
-      WebContentsModalDialogManager::FromWebContents(web_contents_);
-  DCHECK(web_contents_modal_dialog_manager);
-  WebContentsModalDialogManagerDelegate* delegate =
-      web_contents_modal_dialog_manager->delegate();
-  DCHECK(delegate);
-  widget_ = views::Widget::CreateWindowAsFramelessChild(
-      captive_portal_view,
-      delegate->GetWebContentsModalDialogHost()->GetHostView());
-  captive_portal_view->Init();
+  CaptivePortalView* portal = captive_portal_view_.release();
+  web_modal::WebContentsModalDialogManager* manager =
+      web_modal::WebContentsModalDialogManager::FromWebContents(web_contents_);
+  const gfx::NativeWindow parent =
+      manager->delegate()->GetWebContentsModalDialogHost()->GetHostView();
+  widget_ = CreateWindowAsFramelessChild(portal, parent);
+  portal->Init();
 
   widget_->AddObserver(this);
-  web_contents_modal_dialog_manager->ShowModalDialog(
-      widget_->GetNativeView());
+  manager->ShowModalDialog(widget_->GetNativeView());
   DCHECK(GetState() == STATE_DISPLAYED);
 }
 
 void CaptivePortalWindowProxy::Close() {
   if (GetState() == STATE_DISPLAYED)
     widget_->Close();
   captive_portal_view_.reset();
   captive_portal_view_for_testing_ = NULL;
 }
 
@@ skipping 51 matching lines @@
 }
 
 void CaptivePortalWindowProxy::DetachFromWidget(views::Widget* widget) {
   if (!widget_ || widget_ != widget)
     return;
   widget_->RemoveObserver(this);
   widget_ = NULL;
 }
 
 }  // namespace chromeos