Change the views sign-in dialog to be tab modal.

chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc

 // Copyright 2016 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_delegate_views.h"
 
 #include "base/macros.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/signin/signin_promo.h"
@@ skipping 24 matching lines @@
   return profile->IsSyncAllowed() ? kSyncConfirmationDialogHeight
                                   : kSigninErrorDialogHeight;
 }
 
 }  // namespace
 
 SigninViewControllerDelegateViews::SigninViewControllerDelegateViews(
     SigninViewController* signin_view_controller,
     std::unique_ptr<views::WebView> content_view,
     Browser* browser,
+    DialogModalType dialog_modal_type_,
     bool wait_for_size)
     : SigninViewControllerDelegate(signin_view_controller,
                                    content_view->GetWebContents()),
       content_view_(content_view.release()),
       modal_signin_widget_(nullptr),
+      dialog_modal_type_(dialog_modal_type_),
       wait_for_size_(wait_for_size),
       browser_(browser) {
   DCHECK(browser_);
   DCHECK(browser_->tab_strip_model()->GetActiveWebContents())
       << "A tab must be active to present the sign-in modal dialog.";
 
   if (!wait_for_size_)
     DisplayModal();
 }
 
@@ skipping 11 matching lines @@
 const views::Widget* SigninViewControllerDelegateViews::GetWidget() const {
   return content_view_->GetWidget();
 }
 
 void SigninViewControllerDelegateViews::DeleteDelegate() {
   ResetSigninViewControllerDelegate();
   delete this;
 }
 
 ui::ModalType SigninViewControllerDelegateViews::GetModalType() const {
-  return ui::MODAL_TYPE_WINDOW;
+  switch (dialog_modal_type_) {
+    case TAB_MODAL:
+      return ui::MODAL_TYPE_CHILD;
+    case WINDOW_MODAL:
+      return ui::MODAL_TYPE_WINDOW;

[Peter Kasting, 2017/01/11 01:24:45]

Why not just use these values directly everywhere, instead of introducing a new
enum for this class?  MODAL_TYPE_CHILD/WINDOW still seem pretty clear to me.

That would make this function simple, eliminate the enum declaration in the
header, and not add any meaningful complication elsewhere.

[msarda, 2017/01/11 09:54:25]

I hesitated to do that because we only support 2 values of this enum. But I
agree it does simplify the code without any risks as the constructor is only
used in from the methods internal to this class.

Done.

+  }
+  NOTREACHED();
+  return ui::MODAL_TYPE_CHILD;
 }
 
 bool SigninViewControllerDelegateViews::ShouldShowCloseButton() const {
   return false;
 }
 
 int SigninViewControllerDelegateViews::GetDialogButtons() const {
   return ui::DIALOG_BUTTON_NONE;
 }
 
@@ skipping 22 matching lines @@
   content::WebContents* host_web_contents =
       browser_->tab_strip_model()->GetActiveWebContents();
 
   // Avoid displaying the sign-in modal view if there are no active web
   // contents. This happens if the user closes the browser window before this
   // dialog has a chance to be displayed.
   if (!host_web_contents)
     return;
 
   gfx::NativeWindow window = host_web_contents->GetTopLevelNativeWindow();
-  modal_signin_widget_ =
-      constrained_window::CreateBrowserModalDialogViews(this, window);
-  modal_signin_widget_->Show();
+  switch (dialog_modal_type_) {
+    case WINDOW_MODAL:
+      modal_signin_widget_ =
+          constrained_window::CreateBrowserModalDialogViews(this, window);
+      modal_signin_widget_->Show();
+      break;
+    case TAB_MODAL:
+      modal_signin_widget_ = constrained_window::ShowWebModalDialogViews(
+          this, browser_->tab_strip_model()->GetActiveWebContents());
+      break;
+  }
+  content_view_->RequestFocus();
 }
 
 // static
 std::unique_ptr<views::WebView>
 SigninViewControllerDelegateViews::CreateGaiaWebView(
     content::WebContentsDelegate* delegate,
     profiles::BubbleViewMode mode,
     Browser* browser,
     signin_metrics::AccessPoint access_point) {
   GURL url =
@@ skipping 62 matching lines @@
 SigninViewControllerDelegate*
 SigninViewControllerDelegate::CreateModalSigninDelegate(
     SigninViewController* signin_view_controller,
     profiles::BubbleViewMode mode,
     Browser* browser,
     signin_metrics::AccessPoint access_point) {
   return new SigninViewControllerDelegateViews(
       signin_view_controller,
       SigninViewControllerDelegateViews::CreateGaiaWebView(
           nullptr, mode, browser, access_point),
-      browser, false);
+      browser, SigninViewControllerDelegateViews::TAB_MODAL, false);
 }
 
 SigninViewControllerDelegate*
 SigninViewControllerDelegate::CreateSyncConfirmationDelegate(
     SigninViewController* signin_view_controller,
     Browser* browser) {
   return new SigninViewControllerDelegateViews(
       signin_view_controller,
       SigninViewControllerDelegateViews::CreateSyncConfirmationWebView(browser),
-      browser, true);
+      browser, SigninViewControllerDelegateViews::WINDOW_MODAL, true);
 }
 
 SigninViewControllerDelegate*
 SigninViewControllerDelegate::CreateSigninErrorDelegate(
     SigninViewController* signin_view_controller,
     Browser* browser) {
   return new SigninViewControllerDelegateViews(
       signin_view_controller,
       SigninViewControllerDelegateViews::CreateSigninErrorWebView(browser),
-      browser, true);
+      browser, SigninViewControllerDelegateViews::WINDOW_MODAL, true);
 }