Update the new avatar menu

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 50 matching lines @@
 #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 = 400;
+const int kFixedGaiaViewHeight = 440;
 const int kFixedGaiaViewWidth = 360;
 const int kFixedAccountRemovalViewWidth = 280;
 const int kFixedSwitchUserViewWidth = 280;
 const int kLargeImageSide = 88;
 
 // 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 341 matching lines @@
     layout->AddView(new views::Separator(views::Separator::HORIZONTAL));
 
     layout->StartRow(1, 1);
     layout->AddView(view);
 
     return titled_view;
   }
 
  private:
   virtual void Layout() OVERRIDE{
-    back_button_->SetBounds(
-        0, 0, back_button_->GetPreferredSize().width(), height());
-    title_label_->SetBoundsRect(GetContentsBounds());
+    int back_button_width = back_button_->GetPreferredSize().width();

[sky, 2014/08/15 19:07:58]

What if back_button_width > bounds().width()? Shouldn't you cap width to width
of this?

[guohui, 2014/08/15 19:19:23]

back button shows a static icon, so the width is fixed based on resolution, and
it is far less than any view we show.  Also view framework does handle negative
bounds by overwriting it with a minimum size.

+    back_button_->SetBounds(0, 0, back_button_width, height());
+    int label_padding = back_button_width + views::kButtonHEdgeMarginNew;
+    title_label_->SetBounds(
+        label_padding, 0, width() - 2 * label_padding, height());
   }
 
   virtual gfx::Size GetPreferredSize() const OVERRIDE{
     int height = std::max(title_label_->GetPreferredSize().height(),
         back_button_->GetPreferredSize().height());
     return gfx::Size(width(), height);
   }
 
   views::ImageButton* back_button_;
   views::Label* title_label_;
@@ skipping 461 matching lines @@
 
   return view;
 }
 
 views::View* ProfileChooserView::CreateTutorialView(
     profiles::TutorialMode tutorial_mode,
     const base::string16& title_text,
     const base::string16& content_text,
     const base::string16& link_text,
     const base::string16& button_text,
+    bool stack_button,
     views::Link** link,
     views::LabelButton** button) {
   tutorial_mode_ = tutorial_mode;
 
   views::View* view = new views::View();
   view->set_background(views::Background::CreateSolidBackground(
       profiles::kAvatarTutorialBackgroundColor));
   views::GridLayout* layout = CreateSingleColumnLayout(view,
       kFixedMenuWidth - 2 * views::kButtonHEdgeMarginNew);
   layout->SetInsets(views::kButtonVEdgeMarginNew,
@@ skipping 15 matching lines @@
   // Adds body content.
   views::Label* content_label = new views::Label(content_text);
   content_label->SetMultiLine(true);
   content_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   content_label->SetAutoColorReadabilityEnabled(false);
   content_label->SetEnabledColor(profiles::kAvatarTutorialContentTextColor);
   layout->StartRowWithPadding(1, 0, 0, views::kRelatedControlVerticalSpacing);
   layout->AddView(content_label);
 
   // Adds links and buttons.
-  views::ColumnSet* button_columns = layout->AddColumnSet(1);
-  button_columns->AddColumn(views::GridLayout::LEADING,
-      views::GridLayout::CENTER, 0, views::GridLayout::USE_PREF, 0, 0);
-  button_columns->AddPaddingColumn(
-      1, views::kUnrelatedControlHorizontalSpacing);
-  button_columns->AddColumn(views::GridLayout::TRAILING,
-      views::GridLayout::CENTER, 0, views::GridLayout::USE_PREF, 0, 0);
+  *button = new views::LabelButton(this, button_text);
+  (*button)->SetHorizontalAlignment(gfx::ALIGN_CENTER);
+  (*button)->SetStyle(views::Button::STYLE_BUTTON);
+
 
   *link = CreateLink(link_text, this);
   (*link)->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   (*link)->SetAutoColorReadabilityEnabled(false);
   (*link)->SetEnabledColor(SK_ColorWHITE);
-  layout->StartRowWithPadding(1, 1, 0, views::kUnrelatedControlVerticalSpacing);
-  layout->AddView(*link);
 
-  *button = new views::LabelButton(this, button_text);
-  (*button)->SetHorizontalAlignment(gfx::ALIGN_CENTER);
-  (*button)->SetStyle(views::Button::STYLE_BUTTON);
-  layout->AddView(*button);
+  if (stack_button) {
+    layout->StartRowWithPadding(
+        1, 0, 0, views::kUnrelatedControlVerticalSpacing);
+    layout->AddView(*button);
+    layout->StartRowWithPadding(1, 0, 0, views::kRelatedControlVerticalSpacing);
+    (*link)->SetHorizontalAlignment(gfx::ALIGN_CENTER);
+    layout->AddView(*link);
+  } else {
+    views::ColumnSet* button_columns = layout->AddColumnSet(1);
+    button_columns->AddColumn(views::GridLayout::LEADING,
+        views::GridLayout::CENTER, 0, views::GridLayout::USE_PREF, 0, 0);
+    button_columns->AddPaddingColumn(
+        1, views::kUnrelatedControlHorizontalSpacing);
+    button_columns->AddColumn(views::GridLayout::TRAILING,
+        views::GridLayout::CENTER, 0, views::GridLayout::USE_PREF, 0, 0);
+    layout->StartRowWithPadding(
+        1, 1, 0, views::kUnrelatedControlVerticalSpacing);
+    layout->AddView(*link);
+    layout->AddView(*button);
+  }
 
   return view;
 }
 
 views::View* ProfileChooserView::CreateCurrentProfileView(
     const AvatarMenu::Item& avatar_item,
     bool is_guest) {
   views::View* view = new views::View();
   int column_width = kFixedMenuWidth - 2 * views::kButtonHEdgeMarginNew;
   views::GridLayout* layout = CreateSingleColumnLayout(view, column_width);
@@ skipping 432 matching lines @@
 
   return CreateTutorialView(
       profiles::TUTORIAL_MODE_WELCOME_UPGRADE,
       l10n_util::GetStringUTF16(
           IDS_PROFILES_WELCOME_UPGRADE_TUTORIAL_TITLE),
       l10n_util::GetStringUTF16(
           IDS_PROFILES_WELCOME_UPGRADE_TUTORIAL_CONTENT_TEXT),
       l10n_util::GetStringFUTF16(
           IDS_PROFILES_NOT_YOU, avatar_item.name),
       l10n_util::GetStringUTF16(IDS_PROFILES_TUTORIAL_WHATS_NEW_BUTTON),
+      true /* stack_button */,
       &tutorial_not_you_link_,
       &tutorial_see_whats_new_button_);
 }
 
 views::View* ProfileChooserView::CreateSigninConfirmationView(){
   return CreateTutorialView(
       profiles::TUTORIAL_MODE_CONFIRM_SIGNIN,
       l10n_util::GetStringUTF16(IDS_PROFILES_CONFIRM_SIGNIN_TUTORIAL_TITLE),
       l10n_util::GetStringUTF16(
           IDS_PROFILES_CONFIRM_SIGNIN_TUTORIAL_CONTENT_TEXT),
       l10n_util::GetStringUTF16(IDS_PROFILES_SYNC_SETTINGS_LINK),
       l10n_util::GetStringUTF16(IDS_PROFILES_TUTORIAL_OK_BUTTON),
+      false /* stack_button */,
       &tutorial_sync_settings_link_,
       &tutorial_sync_settings_ok_button_);
 }
 
 views::View* ProfileChooserView::CreateSwitchUserView() {
   views::View* view = new views::View();
   views::GridLayout* layout = CreateSingleColumnLayout(
       view, kFixedSwitchUserViewWidth);
   views::ColumnSet* columns = layout->AddColumnSet(1);
   columns->AddPaddingColumn(0, views::kButtonHEdgeMarginNew);
@@ skipping 52 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;
 }