Make the new Gaia password separated signin flow modal.

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright 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/frame/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 2510 matching lines @@
 #endif
 }
 
 void BrowserView::ShowAvatarBubbleFromAvatarButton(
     AvatarBubbleMode mode,
     const signin::ManageAccountsParams& manage_accounts_params) {
 #if defined(FRAME_AVATAR_BUTTON)
   // Do not show avatar bubble if there is no avatar menu button.
   if (!frame_->GetNewAvatarMenuButton())
     return;
-  profiles::BubbleViewMode bubble_view_mode;
-  profiles::TutorialMode tutorial_mode;
-  profiles::BubbleViewModeFromAvatarBubbleMode(mode, &bubble_view_mode,
-                                               &tutorial_mode);
-  ProfileChooserView::ShowBubble(
-      bubble_view_mode, tutorial_mode, manage_accounts_params,
-      frame_->GetNewAvatarMenuButton(), views::BubbleBorder::TOP_RIGHT,
-      views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE, browser());
-  ProfileMetrics::LogProfileOpenMethod(ProfileMetrics::ICON_AVATAR_BUBBLE);
+
+  if (switches::UsePasswordSeparatedSigninFlow() &&
+     (mode == AVATAR_BUBBLE_MODE_SIGNIN ||
+      mode == AVATAR_BUBBLE_MODE_ADD_ACCOUNT ||
+      mode == AVATAR_BUBBLE_MODE_REAUTH)) {

[Roger Tawa OOO till Jul 10th, 2015/11/11 19:34:30]

Call SigninViewController::ShouldShowModalSigninForMode() instead ?

[anthonyvd, 2015/11/24 16:28:04]

Missed that, thanks!

+    ShowModalSigninWindow(mode);
+  } else {
+    profiles::BubbleViewMode bubble_view_mode;
+    profiles::TutorialMode tutorial_mode;
+    profiles::BubbleViewModeFromAvatarBubbleMode(mode, &bubble_view_mode,
+                                                 &tutorial_mode);
+    ProfileChooserView::ShowBubble(
+        bubble_view_mode, tutorial_mode, manage_accounts_params,
+        frame_->GetNewAvatarMenuButton(), views::BubbleBorder::TOP_RIGHT,
+        views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE, browser());
+    ProfileMetrics::LogProfileOpenMethod(ProfileMetrics::ICON_AVATAR_BUBBLE);
+  }
 #else
   NOTREACHED();
 #endif
 }
 
+void BrowserView::ShowModalSigninWindow(AvatarBubbleMode mode) {
+  profiles::BubbleViewMode bubble_view_mode;
+  profiles::TutorialMode tutorial_mode;
+  profiles::BubbleViewModeFromAvatarBubbleMode(mode, &bubble_view_mode,
+                                               &tutorial_mode);
+  signin_view_controller_.ShowModalSignin(bubble_view_mode, browser());
+}
+
+void BrowserView::CloseModalSigninWindow() {
+  signin_view_controller_.CloseModalSignin();
+}
+
 int BrowserView::GetRenderViewHeightInsetWithDetachedBookmarkBar() {
   if (browser_->bookmark_bar_state() != BookmarkBar::DETACHED ||
       !bookmark_bar_view_ || !bookmark_bar_view_->IsDetached()) {
     return 0;
   }
   // Don't use bookmark_bar_view_->height() which won't be the final height if
   // the bookmark bar is animating.
   return chrome::kNTPBookmarkBarHeight -
       views::NonClientFrameView::kClientEdgeThickness;
 }
@@ skipping 86 matching lines @@
   return immersive_mode_controller()->IsEnabled();
 }
 
 views::Widget* BrowserView::GetBubbleAssociatedWidget() {
   return GetWidget();
 }
 
 gfx::Rect BrowserView::GetTopContainerBoundsInScreen() {
   return top_container_->GetBoundsInScreen();
 }