Reland Fix Views web-modal dialog widget creation.

chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.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/ui/views/sync/profile_signin_confirmation_dialog_views.h"
 
 #include <algorithm>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
-#include "components/web_modal/web_contents_modal_dialog_manager.h"
-#include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
 #include "content/public/browser/web_contents.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/range/range.h"
 #include "ui/views/background.h"
@@ skipping 18 matching lines @@
                                                    profile,
                                                    username,
                                                    delegate);
 }
 }  // namespace chrome
 
 ProfileSigninConfirmationDialogViews::ProfileSigninConfirmationDialogViews(
     Browser* browser,
     const std::string& username,
     ui::ProfileSigninConfirmationDelegate* delegate)
-  : browser_(browser),
-    username_(username),
-    delegate_(delegate),
-    prompt_for_new_profile_(true),
-    continue_signin_button_(NULL) {
+    : browser_(browser),
+      username_(username),
+      delegate_(delegate),
+      prompt_for_new_profile_(true),
+      continue_signin_button_(NULL) {
 }
 
 ProfileSigninConfirmationDialogViews::~ProfileSigninConfirmationDialogViews() {}
 
 // static
 void ProfileSigninConfirmationDialogViews::ShowDialog(
     Browser* browser,
     Profile* profile,
     const std::string& username,
     ui::ProfileSigninConfirmationDelegate* delegate) {
@@ skipping 65 matching lines @@
     delegate_ = NULL;
   }
   return true;
 }
 
 void ProfileSigninConfirmationDialogViews::OnClosed() {
   Cancel();
 }
 
 ui::ModalType ProfileSigninConfirmationDialogViews::GetModalType() const {
-  return ui::MODAL_TYPE_WINDOW;
+  return ui::MODAL_TYPE_CHILD;
 }
 
 void ProfileSigninConfirmationDialogViews::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (!details.is_add || details.child != this)
     return;
 
   const SkColor kPromptBarBackgroundColor =
       ui::GetSigninConfirmationPromptBarColor(
           ui::kSigninConfirmationPromptBarBackgroundAlpha);
@@ skipping 95 matching lines @@
     views::Button* sender,
     const ui::Event& event) {
   DCHECK(prompt_for_new_profile_);
   DCHECK_EQ(continue_signin_button_, sender);
   if (delegate_) {
     delegate_->OnContinueSignin();
     delegate_ = NULL;
   }
   GetWidget()->Close();
 }