Implement new password separated sign in flow for chrome desktop.

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

 // Copyright 2014 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/profile_chooser_view.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
@@ skipping 49 matching lines @@
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/webview/webview.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/widget/widget.h"
 
 namespace {
 
 // Helpers --------------------------------------------------------------------
 
 const int kFixedMenuWidth = 250;
 const int kButtonHeight = 32;
-const int kFixedGaiaViewHeight = 440;
-const int kFixedGaiaViewWidth = 360;
+const int kOldFixedGaiaViewHeight = 440;
+const int kOldFixedGaiaViewWidth = 360;
+const int kFixedGaiaViewHeight = 512;
+const int kFixedGaiaViewWidth = 448;
 const int kFixedAccountRemovalViewWidth = 280;
 const int kFixedSwitchUserViewWidth = 320;
 const int kLargeImageSide = 88;
 
 const int kVerticalSpacing = 16;
 
+const int kTitleViewNativeWidgetOffset = 8;
+
 bool IsProfileChooser(profiles::BubbleViewMode mode) {
   return mode == profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER ||
       mode == profiles::BUBBLE_VIEW_MODE_FAST_PROFILE_CHOOSER;
 }
 
 // Creates a GridLayout with a single column. This ensures that all the child
 // views added get auto-expanded to fill the full width of the bubble.
 views::GridLayout* CreateSingleColumnLayout(views::View* view, int width) {
   views::GridLayout* layout = new views::GridLayout(view);
   view->SetLayoutManager(layout);
@@ skipping 76 matching lines @@
  public:
   explicit SizedContainer(const gfx::Size& preferred_size)
       : preferred_size_(preferred_size) {}
 
   gfx::Size GetPreferredSize() const override { return preferred_size_; }
 
  private:
   gfx::Size preferred_size_;
 };
 
+// A view to host the GAIA webview overlapped with a back button.  This class
+// is needed to reparent the back button inside a native view so that on
+// windows, user input can be be properly routed to the button.
+class HostView : public views::View {
+ public:
+  HostView() : title_view_(nullptr), title_widget_(nullptr) {}
+  ~HostView() override;
+
+  void Initialize(views::View* title_view, views::View* main_view);
+
+ private:
+  // views::View:
+  void ViewHierarchyChanged(
+      const ViewHierarchyChangedDetails& details) override;
+
+  // The title itself and the overlaped widget that contains it.
+  views::View* title_view_;
+  scoped_ptr<views::Widget> title_widget_;
+
+  DISALLOW_COPY_AND_ASSIGN(HostView);
+};
+
+HostView::~HostView() {}
+
+void HostView::Initialize(views::View* title_view, views::View* main_view) {
+  title_view_ = title_view;
+  title_view_->set_owned_by_client();
+  AddChildView(main_view);
+  SetLayoutManager(new views::FillLayout());
+}
+
+void HostView::ViewHierarchyChanged(
+    const ViewHierarchyChangedDetails& details) {
+  if (!details.is_add || details.child != this)
+    return;
+
+  if (title_widget_ != nullptr)
+    return;
+
+  // The title view must be placed within its own widget so that it can
+  // properly receive user input when overlapped on another view.
+  views::Widget::InitParams params(
+      views::Widget::InitParams::TYPE_CONTROL);
+  params.parent = GetWidget()->GetNativeView();
+  params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
+  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+  title_widget_.reset(new views::Widget);
+  title_widget_->Init(params);
+  title_widget_->SetContentsView(title_view_);
+
+  gfx::Rect bounds(title_view_->GetPreferredSize());
+  title_view_->SetBoundsRect(bounds);
+  bounds.Offset(kTitleViewNativeWidgetOffset, kTitleViewNativeWidgetOffset);
+  title_widget_->SetBounds(bounds);
+}
+
 }  // namespace
 
 // RightAlignedIconLabelButton -------------------------------------------------
 
 // A custom LabelButton that has a centered text and right aligned icon.
 class RightAlignedIconLabelButton : public views::LabelButton {
  public:
   RightAlignedIconLabelButton(views::ButtonListener* listener,
                               const base::string16& text)
       : views::LabelButton(listener, text) {
@@ skipping 199 matching lines @@
   views::Textfield* profile_name_textfield_;
 
   DISALLOW_COPY_AND_ASSIGN(EditableProfileName);
 };
 
 // A title card with one back button right aligned and one label center aligned.
 class TitleCard : public views::View {
  public:
   TitleCard(const base::string16& message, views::ButtonListener* listener,
             views::ImageButton** back_button) {
-    back_button_ = new views::ImageButton(listener);
-    back_button_->SetImageAlignment(views::ImageButton::ALIGN_LEFT,
-                                    views::ImageButton::ALIGN_MIDDLE);
-    ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
-    back_button_->SetImage(views::ImageButton::STATE_NORMAL,
-                           rb->GetImageSkiaNamed(IDR_BACK));
-    back_button_->SetImage(views::ImageButton::STATE_HOVERED,
-                           rb->GetImageSkiaNamed(IDR_BACK_H));
-    back_button_->SetImage(views::ImageButton::STATE_PRESSED,
-                           rb->GetImageSkiaNamed(IDR_BACK_P));
-    back_button_->SetImage(views::ImageButton::STATE_DISABLED,
-                           rb->GetImageSkiaNamed(IDR_BACK_D));
-    back_button_->SetFocusable(true);
+    back_button_ = CreateBackButton(listener);
     *back_button = back_button_;
 
     title_label_ = new views::Label(message);
     title_label_->SetHorizontalAlignment(gfx::ALIGN_CENTER);
+    ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
     const gfx::FontList& medium_font_list =
         rb->GetFontList(ui::ResourceBundle::MediumFont);
     title_label_->SetFontList(medium_font_list);
 
     AddChildView(back_button_);
     AddChildView(title_label_);
   }
 
+  static views::ImageButton* CreateBackButton(views::ButtonListener* listener) {
+    views::ImageButton* back_button = new views::ImageButton(listener);
+    back_button->SetImageAlignment(views::ImageButton::ALIGN_LEFT,
+                                   views::ImageButton::ALIGN_MIDDLE);
+    ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
+    back_button->SetImage(views::ImageButton::STATE_NORMAL,
+                          rb->GetImageSkiaNamed(IDR_BACK));
+    back_button->SetImage(views::ImageButton::STATE_HOVERED,
+                          rb->GetImageSkiaNamed(IDR_BACK_H));
+    back_button->SetImage(views::ImageButton::STATE_PRESSED,
+                          rb->GetImageSkiaNamed(IDR_BACK_P));
+    back_button->SetImage(views::ImageButton::STATE_DISABLED,
+                          rb->GetImageSkiaNamed(IDR_BACK_D));
+    back_button->SetFocusable(true);
+    return back_button;
+  }
+
   // Creates a new view that has the |title_card| with horizontal padding at the
   // top, an edge-to-edge separator below, and the specified |view| at the
   // bottom.
   static views::View* AddPaddedTitleCard(views::View* view,
                                          TitleCard* title_card,
                                          int width) {
     views::View* titled_view = new views::View();
     views::GridLayout* layout = new views::GridLayout(titled_view);
     titled_view->SetLayoutManager(layout);
 
@@ skipping 278 matching lines @@
   ResetView();
   RemoveAllChildViews(true);
   view_mode_ = view_to_display;
 
   views::GridLayout* layout = nullptr;
   views::View* sub_view = nullptr;
   views::View* view_to_focus = nullptr;
   switch (view_mode_) {
     case profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN:
     case profiles::BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT:
-    case profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH:
-      layout = CreateSingleColumnLayout(this, kFixedGaiaViewWidth);
+    case profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH: {
+      int width = switches::UseNewGaiaFlow()
+          ? kFixedGaiaViewWidth : kOldFixedGaiaViewWidth;
+      layout = CreateSingleColumnLayout(this, width);
       sub_view = CreateGaiaSigninView(&view_to_focus);
       break;
+    }
     case profiles::BUBBLE_VIEW_MODE_ACCOUNT_REMOVAL:
       layout = CreateSingleColumnLayout(this, kFixedAccountRemovalViewWidth);
       sub_view = CreateAccountRemovalView();
       break;
     case profiles::BUBBLE_VIEW_MODE_SWITCH_USER:
       layout = CreateSingleColumnLayout(this, kFixedSwitchUserViewWidth);
       sub_view = CreateSwitchUserView();
       ProfileMetrics::LogProfileNewAvatarMenuNotYou(
           ProfileMetrics::PROFILE_AVATAR_MENU_NOT_YOU_VIEW);
       break;
@@ skipping 837 matching lines @@
       url = signin::GetReauthURL(browser_->profile(),
                                  GetAuthErrorAccountId(browser_->profile()));
       message_id = IDS_PROFILES_GAIA_REAUTH_TITLE;
       break;
     }
     default:
       NOTREACHED() << "Called with invalid mode=" << view_mode_;
       return NULL;
   }
 
-  // Adds Gaia signin webview
+  // Adds Gaia signin webview.
+  gfx::Size pref_size = switches::UseNewGaiaFlow()

[anthonyvd, 2015/09/15 18:13:47]

Maybe move this before the switch and use pref_size.width() at line 796?

[Roger Tawa OOO till Jul 10th, 2015/09/16 19:27:29]

Line 796 is in another function.  Maybe I'm missing something?

[anthonyvd, 2015/09/16 19:55:32]

That's entirely my bad, the lines in between were collapsed and I didn't notice
-_-

+      ? gfx::Size(kFixedGaiaViewWidth, kFixedGaiaViewHeight)
+      : gfx::Size(kOldFixedGaiaViewWidth, kOldFixedGaiaViewHeight);
   Profile* profile = browser_->profile();
   views::WebView* web_view = new views::WebView(profile);
   web_view->LoadInitialURL(url);
   web_view->GetWebContents()->SetDelegate(this);
-  web_view->SetPreferredSize(
-      gfx::Size(kFixedGaiaViewWidth, kFixedGaiaViewHeight));
+  web_view->SetPreferredSize(pref_size);
   content::RenderWidgetHostView* rwhv =
       web_view->GetWebContents()->GetRenderWidgetHostView();
   if (rwhv)
     rwhv->SetBackgroundColor(profiles::kAvatarBubbleGaiaBackgroundColor);
+
+  if (signin_content_view)
+    *signin_content_view = web_view;
+
+  if (switches::UseNewGaiaFlow()) {
+    gaia_signin_cancel_button_ = TitleCard::CreateBackButton(this);
+    HostView* host = new HostView();
+    host->Initialize(gaia_signin_cancel_button_, web_view);
+    return host;
+  }
+
   TitleCard* title_card = new TitleCard(l10n_util::GetStringUTF16(message_id),
                                         this,
                                         &gaia_signin_cancel_button_);
-  if (signin_content_view)
-    *signin_content_view = web_view;
   return TitleCard::AddPaddedTitleCard(
-      web_view, title_card, kFixedGaiaViewWidth);
+      web_view, title_card, kOldFixedGaiaViewWidth);
 }
 
 views::View* ProfileChooserView::CreateAccountRemovalView() {
   views::View* view = new views::View();
   views::GridLayout* layout = CreateSingleColumnLayout(
       view, kFixedAccountRemovalViewWidth - 2 * views::kButtonHEdgeMarginNew);
   layout->SetInsets(0,
                     views::kButtonHEdgeMarginNew,
                     views::kButtonVEdgeMarginNew,
                     views::kButtonHEdgeMarginNew);
@@ skipping 188 matching lines @@
       IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) !=
           IncognitoModePrefs::DISABLED;
   return incognito_available && !browser_->profile()->IsGuestSession();
 }
 
 void ProfileChooserView::PostActionPerformed(
     ProfileMetrics::ProfileDesktopMenu action_performed) {
   ProfileMetrics::LogProfileDesktopMenu(action_performed, gaia_service_type_);
   gaia_service_type_ = signin::GAIA_SERVICE_TYPE_NONE;
 }