OneClickSigninBubbleView: Update the bubble form to reflect new bubble/

chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc

 // Copyright (c) 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/sync/one_click_signin_bubble_view.h"
 
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/google/google_util.h"
@@ skipping 10 matching lines @@
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
+// Minimum width of the the bubble.
+const int kMinBubbleWidth = 310;
+
 // Minimum width for the multi-line label.
 const int kMinimumDialogLabelWidth = 400;

[noms (inactive), 2014/01/06 22:22:23]

What's the difference between kMinBubbleWidth and kMinDialogLabelWidth? I see
that the dialog message label is sized to fit kMinDialogLabelWidth -- does this
still make sense? It's bigger than the min bubble width. Perhaps only one of the
two should be used.

[Oren Blasberg, 2014/01/07 00:12:20]

The bubble and dialog modes of the view aren't necessarily supposed to have the
same widths -- I wanted to leave the dialog mode untouched, so I just added a
new constant for the bubble.
The kMinimumDialogLabelWidth constant is still used, but only when this view is
initialized as a dialog.

BTW, how do I get the dialog mode to show up from within the browser? It used to
be that if I signed in and intentionally mistyped my password then typed it
correctly the second time, it would show this mode. However that doesn't seem to
be working anymore.

[Oren Blasberg, 2014/01/08 21:44:00]

As discussed offline I've moved the layout->set_minimum_size call into the
InitBubbleContent (so we only set the bubble width when in bubble mode).  This
is a no op change visually but makes the code more sensible. Thanks!

 const int kMinimumLabelWidth = 240;
+const int kBubbleMargin = 20;

[noms (inactive), 2014/01/06 22:22:23]

You don't need to redefine this, you can just use kButtonVEdgeMarginNew (or
HEdge) from layout_constants.h

[Oren Blasberg, 2014/01/07 00:12:20]

Done.

 const int kDialogMargin = 16;
 
 namespace {
 
 // The column set constants that can be used in the InitContent() function
 // to layout views.
 enum OneClickSigninBubbleColumnTypes {
   COLUMN_SET_FILL_ALIGN,
   COLUMN_SET_CONTROLS,
   COLUMN_SET_TITLE_BAR
@@ skipping 64 matching lines @@
       ok_button_(NULL),
       undo_button_(NULL),
       close_button_(NULL),
       clicked_learn_more_(false),
       message_loop_for_testing_(NULL) {
   if (is_sync_dialog_) {
     DCHECK(!start_sync_callback_.is_null());
     set_arrow(views::BubbleBorder::NONE);
     set_anchor_view_insets(gfx::Insets(0, 0, anchor_view->height() / 2, 0));
     set_close_on_deactivate(false);
-    set_margins(gfx::Insets(kDialogMargin, kDialogMargin, kDialogMargin,
-                          kDialogMargin));
   }
+  int margin = is_sync_dialog_ ? kDialogMargin : kBubbleMargin;
+  set_margins(gfx::Insets(margin, margin, margin, margin));
 }
 
 OneClickSigninBubbleView::~OneClickSigninBubbleView() {
 }
 
 ui::ModalType OneClickSigninBubbleView::GetModalType() const {
   return is_sync_dialog_? ui::MODAL_TYPE_CHILD : ui::MODAL_TYPE_NONE;
 }
 
 void OneClickSigninBubbleView::AnimationEnded(const gfx::Animation* animation) {
   views::BubbleDelegateView::AnimationEnded(animation);
   if (message_loop_for_testing_)
     message_loop_for_testing_->Quit();
 }
 
 void OneClickSigninBubbleView::Init() {
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
+  layout->set_minimum_size(gfx::Size(kMinBubbleWidth, 0));
   set_border(views::Border::CreateEmptyBorder(8, 8, 8, 8));
 
   // Column set for descriptive text and link.
   views::ColumnSet* cs = layout->AddColumnSet(COLUMN_SET_FILL_ALIGN);
   cs->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER, 1,
                 views::GridLayout::USE_PREF, 0, 0);
 
   // Column set for buttons at bottom of bubble.
   cs = layout->AddColumnSet(COLUMN_SET_CONTROLS);
   cs->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, 0,
                 views::GridLayout::USE_PREF, 0, 0);
   cs->AddPaddingColumn(1, views::kUnrelatedControlHorizontalSpacing);
   cs->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER, 0,
                 views::GridLayout::USE_PREF, 0, 0);
-  cs->AddPaddingColumn(0, views::kRelatedButtonHSpacing);
   cs->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER, 0,
                 views::GridLayout::USE_PREF, 0, 0);
 
   is_sync_dialog_ ? InitDialogContent(layout) : InitBubbleContent(layout);
 
   // Add controls at the bottom.
   // Don't display the advanced link for the error bubble.
   if (is_sync_dialog_ || error_message_.empty()) {
     InitAdvancedLink();
     layout->StartRow(0, COLUMN_SET_CONTROLS);
     layout->AddView(advanced_link_);
   }
 
   InitButtons(layout);
   ok_button_->SetIsDefault(true);
 
   AddAccelerator(ui::Accelerator(ui::VKEY_RETURN, 0));
 }
 
 void OneClickSigninBubbleView::InitBubbleContent(views::GridLayout* layout) {
+  // Add title message.
+  views::ColumnSet* cs = layout->AddColumnSet(COLUMN_SET_TITLE_BAR);
+  cs->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, 0,
+                views::GridLayout::USE_PREF, 0, 0);
+  {
+    layout->StartRow(0, COLUMN_SET_TITLE_BAR);
+
+    views::Label* label = new views::Label(
+        l10n_util::GetStringUTF16(IDS_ONE_CLICK_SIGNIN_DIALOG_TITLE_NEW));
+    label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+    label->SetFont(label->font().DeriveFont(3));
+    layout->AddView(label);
+  }
+
+  layout->AddPaddingRow(0, views::kUnrelatedControlLargeVerticalSpacing);
+
   // Add main text description.
   layout->StartRow(0, COLUMN_SET_FILL_ALIGN);
 
   views::Label* label = !error_message_.empty() ?
       new views::Label(error_message_) :
       new views::Label(
           l10n_util::GetStringUTF16(IDS_ONE_CLICK_SIGNIN_BUBBLE_MESSAGE));
 
   label->SetMultiLine(true);
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   label->SizeToFit(kMinimumLabelWidth);
   layout->AddView(label);
 
+  layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
+
   layout->StartRow(0, COLUMN_SET_CONTROLS);
 
   InitLearnMoreLink();
   layout->AddView(learn_more_link_);
 }
 
 void OneClickSigninBubbleView::InitDialogContent(views::GridLayout* layout) {
   OneClickSigninHelper::LogConfirmHistogramValue(
       one_click_signin::HISTOGRAM_CONFIRM_SHOWN);
 
@@ skipping 60 matching lines @@
 
 void OneClickSigninBubbleView::GetButtons(views::LabelButton** ok_button,
                                           views::LabelButton** undo_button) {
   *ok_button = new views::LabelButton(this, base::string16());
   (*ok_button)->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
 
   // The default size of the buttons is too large.  To allow them to be smaller
   // ignore the minimum default size.,
   (*ok_button)->set_min_size(gfx::Size());
 
-  base::string16 ok_label;
+  base::string16 ok_label =
+      l10n_util::GetStringUTF16(IDS_ONE_CLICK_SIGNIN_DIALOG_OK_BUTTON);
 
   if (is_sync_dialog_) {
     *undo_button = new views::LabelButton(this, base::string16());
     (*undo_button)->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
     (*undo_button)->set_min_size(gfx::Size());
 
-    ok_label = l10n_util::GetStringUTF16(IDS_ONE_CLICK_SIGNIN_DIALOG_OK_BUTTON);
     base::string16 undo_label =
         l10n_util::GetStringUTF16(IDS_ONE_CLICK_SIGNIN_DIALOG_UNDO_BUTTON);
 
     // To make sure they are the same size, SetText() is called
     // with both strings on both buttons.
     (*ok_button)->SetText(undo_label);
     (*ok_button)->SetText(ok_label);
     (*undo_button)->SetText(ok_label);
     (*undo_button)->SetText(undo_label);
   } else {
-    ok_label = l10n_util::GetStringUTF16(IDS_OK);
     (*ok_button)->SetText(ok_label);

[noms (inactive), 2014/01/06 22:22:23]

You can move this (and above) to right under the ok_label definition, as it no
longer needs to be if/elsed

[Oren Blasberg, 2014/01/07 00:12:20]

Ah. Duh. Thanks. :)

[Oren Blasberg, 2014/01/07 00:12:20]

Done.

   }
 }
 
 void OneClickSigninBubbleView::InitAdvancedLink() {
   advanced_link_ = new views::Link(
       l10n_util::GetStringUTF16(IDS_ONE_CLICK_SIGNIN_DIALOG_ADVANCED));
 
   advanced_link_->set_listener(this);
   advanced_link_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
 }
@@ skipping 101 matching lines @@
   // we'll be destroyed asynchronously and the shown state will be checked
   // before then.
   DCHECK_EQ(bubble_view_, this);
   bubble_view_ = NULL;
 
   if (is_sync_dialog_ && !start_sync_callback_.is_null()) {
     base::ResetAndReturn(&start_sync_callback_).Run(
         OneClickSigninSyncStarter::UNDO_SYNC);
   }
 }