Make the new Gaia password separated signin flow modal.

chrome/browser/ui/views/profiles/signin_view_controller.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/profiles/signin_view_controller.h"
+
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_avatar_icon_util.h"
+#include "chrome/browser/signin/signin_error_controller_factory.h"
+#include "chrome/browser/signin/signin_promo.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "components/constrained_window/constrained_window_views.h"
+#include "components/signin/core/browser/signin_error_controller.h"
+#include "components/signin/core/common/profile_management_switches.h"
+#include "content/public/browser/render_widget_host_view.h"
+#include "content/public/browser/web_contents.h"
+#include "ui/views/controls/webview/webview.h"
+#include "ui/views/widget/widget.h"
+#include "ui/views/widget/widget_delegate.h"
+#include "ui/views/window/dialog_delegate.h"
+
+const int kPasswordCombinedFixedGaiaViewHeight = 440;
+const int kPasswordCombinedFixedGaiaViewWidth = 360;
+const int kFixedGaiaViewHeight = 512;
+const int kFixedGaiaViewWidth = 448;
+
+class SigninViewControllerImpl {
+ public:
+  SigninViewControllerImpl() : modal_signin_widget_(nullptr) {}
+
+  void ShowModalSignin(views::Widget* widget) {
+    modal_signin_widget_ = widget;
+  }
+
+  void CloseModalSignin() {
+    if (modal_signin_widget_) {
+      modal_signin_widget_->Close();

[sky, 2015/11/30 16:16:38]

Close is not synchronous. DeleteDelegate will be called async, and this code
doesn't handle that well.

[anthonyvd, 2015/11/30 21:59:34]

Ahh, I didn't think about that!

I believe the latest patchset addresses this by having the delegates observe the
view controller, which in turn only notifies observers when the dialog should be
closed. Ultimately, the delegates register/unregister themselves from the event
and are the only ones responsible for closing the window and deleting
themselves.

Let me know what you think.

+      modal_signin_widget_ = nullptr;
+    }
+  }
+
+  void Reset() {
+    modal_signin_widget_ = nullptr;
+  }
+
+ private:
+  views::Widget* modal_signin_widget_;  // Not owned.
+
+  DISALLOW_COPY_AND_ASSIGN(SigninViewControllerImpl);
+};
+
+class ModalSigninDelegate : public views::DialogDelegateView,
+                            public content::WebContentsDelegate {
+ public:
+  explicit ModalSigninDelegate(SigninViewControllerImpl* signin_view_controller,
+                               views::WebView* content_view)
+      : content_view_(content_view),
+        signin_view_controller_(signin_view_controller) {
+    content_view_->GetWebContents()->SetDelegate(this);
+  }
+
+  views::View* GetContentsView() override {
+    return content_view_;
+  }
+
+  views::Widget* GetWidget() override {
+    return content_view_->GetWidget();
+  }
+
+  const views::Widget* GetWidget() const override {
+    return content_view_->GetWidget();
+  }
+
+  void DeleteDelegate() override {
+    signin_view_controller_->Reset();
+    delete this;
+  }
+
+  ui::ModalType GetModalType() const override {
+    return ui::MODAL_TYPE_CHILD;
+  }
+
+  bool ShouldShowCloseButton() const override {
+    return false;
+  }
+
+  int GetDialogButtons() const override {
+    return ui::DIALOG_BUTTON_NONE;
+  }
+
+ private:
+  views::WebView* content_view_;
+  SigninViewControllerImpl* signin_view_controller_;  // Not owned.
+
+  DISALLOW_COPY_AND_ASSIGN(ModalSigninDelegate);
+};
+
+SigninViewController::SigninViewController()
+    : impl_(new SigninViewControllerImpl) {}
+
+SigninViewController::~SigninViewController() {
+  CloseModalSignin();
+  delete impl_;
+}
+
+// static
+views::WebView* SigninViewController::CreateGaiaWebView(
+    WebContentsDelegate* delegate,
+    profiles::BubbleViewMode mode,
+    Profile* profile) {
+  GURL url = signin::GetSigninURLFromBubbleViewMode(profile, mode);
+
+  // Adds Gaia signin webview.
+  const gfx::Size pref_size = switches::UsePasswordSeparatedSigninFlow()
+      ? gfx::Size(kFixedGaiaViewWidth, kFixedGaiaViewHeight)
+      : gfx::Size(kPasswordCombinedFixedGaiaViewWidth,
+                  kPasswordCombinedFixedGaiaViewHeight);
+  views::WebView* web_view = new views::WebView(profile);
+  web_view->LoadInitialURL(url);
+  web_view->GetWebContents()->SetDelegate(delegate);
+  web_view->SetPreferredSize(pref_size);
+  content::RenderWidgetHostView* rwhv =
+      web_view->GetWebContents()->GetRenderWidgetHostView();
+  if (rwhv)
+    rwhv->SetBackgroundColor(profiles::kAvatarBubbleGaiaBackgroundColor);
+
+  return web_view;
+}
+
+void SigninViewController::ShowModalSignin(
+    profiles::BubbleViewMode mode,
+    Browser* browser) {
+  CloseModalSignin();
+  ModalSigninDelegate* delegate = new ModalSigninDelegate(impl_,
+      CreateGaiaWebView(this, mode, browser->profile()));
+  views::Widget* widget = constrained_window::ShowWebModalDialogViews(
+      delegate, browser->tab_strip_model()->GetActiveWebContents());
+  impl_->ShowModalSignin(widget);
+}
+
+void SigninViewController::CloseModalSignin() {
+  impl_->CloseModalSignin();
+}
+
+// static
+bool SigninViewController::ShouldShowModalSigninForMode(
+    profiles::BubbleViewMode mode) {
+  return switches::UsePasswordSeparatedSigninFlow() &&
+        (mode == profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN ||
+         mode == profiles::BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT ||
+         mode == profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH);
+}