Reland Fix Views web-modal dialog widget creation.

chrome/browser/ui/views/autofill/autofill_dialog_views.cc

 // 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.
 
 #include "chrome/browser/ui/views/autofill/autofill_dialog_views.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 49 matching lines @@
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/painter.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 #include "ui/views/window/non_client_view.h"
 
-using web_modal::WebContentsModalDialogManager;
-using web_modal::WebContentsModalDialogManagerDelegate;
-
 namespace autofill {
 
 namespace {
 
 // The width for the section container.
 const int kSectionContainerWidth = 440;
 
 // The minimum useful height of the contents area of the dialog.
 const int kMinimumContentsHeight = 101;
 
@@ skipping 1151 matching lines @@
   HideErrorBubble();
   DCHECK(!window_);
 }
 
 void AutofillDialogViews::Show() {
   InitChildViews();
   UpdateAccountChooser();
   UpdateNotificationArea();
   UpdateButtonStripExtraView();
 
-  // Ownership of |contents_| is handed off by this call. The widget will take
-  // care of deleting itself after calling DeleteDelegate().
-  WebContentsModalDialogManager* web_contents_modal_dialog_manager =
-      WebContentsModalDialogManager::FromWebContents(
-          delegate_->GetWebContents());
-  WebContentsModalDialogManagerDelegate* modal_delegate =
-      web_contents_modal_dialog_manager->delegate();
-  DCHECK(modal_delegate);
-  window_ = views::Widget::CreateWindowAsFramelessChild(
-      this, modal_delegate->GetWebContentsModalDialogHost()->GetHostView());
-  web_contents_modal_dialog_manager->ShowModalDialog(
-      window_->GetNativeView());
+  window_ = ShowWebModalDialogViews(this, delegate_->GetWebContents());
   focus_manager_ = window_->GetFocusManager();
   focus_manager_->AddFocusChangeListener(this);
 
   ShowDialogInMode(DETAIL_INPUT);
 
   // Listen for size changes on the browser.
   views::Widget* browser_widget =
       views::Widget::GetTopLevelWidgetForNativeView(
           delegate_->GetWebContents()->GetNativeView());
   observer_.Add(browser_widget);
@@ skipping 263 matching lines @@
 
   // NOTE: This color may change because of |auto_color_readability|, set on
   // |legal_document_view_|.
   views::StyledLabel::RangeStyleInfo default_style;
   default_style.color =
       theme->GetSystemColor(ui::NativeTheme::kColorId_LabelDisabledColor);
 
   legal_document_view_->SetDefaultStyle(default_style);
 }
 
+ui::ModalType AutofillDialogViews::GetModalType() const {
+  return ui::MODAL_TYPE_CHILD;
+}
+
 base::string16 AutofillDialogViews::GetWindowTitle() const {
   base::string16 title = delegate_->DialogTitle();
   // Hack alert: we don't want the dialog to jiggle when a title is added or
   // removed. Setting a non-empty string here keeps the dialog's title bar the
   // same size.
   return title.empty() ? base::ASCIIToUTF16(" ") : title;
 }
 
 void AutofillDialogViews::WindowClosing() {
   focus_manager_->RemoveFocusChangeListener(this);
@@ skipping 252 matching lines @@
   return gfx::Size(width + insets.width(), height + insets.height());
 }
 
 gfx::Size AutofillDialogViews::GetMinimumSignInViewSize() const {
   return gfx::Size(GetDialogClientView()->size().width() - GetInsets().width(),
                    kMinimumContentsHeight);
 }
 
 gfx::Size AutofillDialogViews::GetMaximumSignInViewSize() const {
   web_modal::WebContentsModalDialogHost* dialog_host =
-      WebContentsModalDialogManager::FromWebContents(
+      web_modal::WebContentsModalDialogManager::FromWebContents(
           delegate_->GetWebContents())->delegate()->
               GetWebContentsModalDialogHost();
 
   // Inset the maximum dialog height to get the maximum content height.
   int height = dialog_host->GetMaximumDialogSize().height();
   const int non_client_height = GetWidget()->non_client_view()->height();
   const int client_height = GetWidget()->client_view()->height();
   // TODO(msw): Resolve the 12 pixel discrepancy; is that the bubble border?
   height -= non_client_height - client_height - 12;
   height = std::max(height, kMinimumContentsHeight);
@@ skipping 501 matching lines @@
   if (updates_scope_ != 0) {
     needs_update_ = true;
     return;
   }
 
   preferred_size_ = gfx::Size();
 
   if (GetWidget() && delegate_ && delegate_->GetWebContents()) {
     UpdateWebContentsModalDialogPosition(
         GetWidget(),
-        WebContentsModalDialogManager::FromWebContents(
+        web_modal::WebContentsModalDialogManager::FromWebContents(
             delegate_->GetWebContents())->delegate()->
                 GetWebContentsModalDialogHost());
     SetBoundsRect(bounds());
   }
 }
 
 AutofillDialogViews::DetailsGroup* AutofillDialogViews::GroupForSection(
     DialogSection section) {
   return &detail_groups_.find(section)->second;
 }
@@ skipping 168 matching lines @@
 AutofillDialogViews::DetailsGroup::DetailsGroup(DialogSection section)
     : section(section),
       container(NULL),
       manual_input(NULL),
       suggested_info(NULL),
       suggested_button(NULL) {}
 
 AutofillDialogViews::DetailsGroup::~DetailsGroup() {}
 
 }  // namespace autofill