Beautify the gaia signin view

chrome/browser/ui/views/profile_chooser_view.cc

 // Copyright 2013 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/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 291 matching lines @@
     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 = back_button_;
 
     title_label_ = new views::Label(l10n_util::GetStringUTF16(message_id));
     title_label_->SetHorizontalAlignment(gfx::ALIGN_CENTER);
+    const gfx::FontList& medium_font_list =
+        rb->GetFontList(ui::ResourceBundle::MediumFont);
+    title_label_->SetFontList(medium_font_list);
 
     AddChildView(back_button_);
     AddChildView(title_label_);
   }
 
  private:
   virtual void Layout() OVERRIDE{
     back_button_->SetBoundsRect(GetContentsBounds());
     title_label_->SetBoundsRect(GetContentsBounds());
   }
@@ skipping 695 matching lines @@
   layout->StartRow(1, 0);
   layout->AddView(email_button);
 
   // Save the original email address, as the button text could be elided.
   current_profile_accounts_map_[email_button] = account;
 }
 
 views::View* ProfileChooserView::CreateGaiaSigninView(
     bool add_secondary_account) {
   views::View* view = new views::View();
-  int available_width = kFixedGaiaViewWidth - 2 * views::kButtonHEdgeMarginNew;
-  views::GridLayout* layout = CreateSingleColumnLayout(view, available_width);
-  layout->SetInsets(views::kButtonVEdgeMarginNew,
-                    views::kButtonHEdgeMarginNew,
-                    views::kButtonVEdgeMarginNew,
-                    views::kButtonHEdgeMarginNew);
+  views::GridLayout* layout =
+      CreateSingleColumnLayout(view, kFixedGaiaViewWidth);
 
   // Adds title.
-  layout->StartRow(1, 0);
-  layout->AddView(new TitleCard(
+  views::View* padded_title = new views::View();
+  int available_width = kFixedGaiaViewWidth - 2 * views::kButtonHEdgeMarginNew;
+  views::GridLayout* padded_layout = CreateSingleColumnLayout(
+      padded_title, available_width);
+  padded_layout->SetInsets(views::kButtonVEdgeMarginNew,
+                           views::kButtonHEdgeMarginNew,
+                           views::kButtonVEdgeMarginNew,
+                           views::kButtonHEdgeMarginNew);
+  padded_layout->StartRow(1, 0);
+  padded_layout->AddView(new TitleCard(
       add_secondary_account ? IDS_PROFILES_GAIA_ADD_ACCOUNT_TITLE :
                               IDS_PROFILES_GAIA_SIGNIN_TITLE,
       this, &gaia_signin_cancel_button_));
-  layout->StartRowWithPadding(1, 0, 0, views::kRelatedControlVerticalSpacing);
+
+  layout->StartRow(1, 0);
+  layout->AddView(padded_title);
+  layout->StartRow(1, 0);
   layout->AddView(new views::Separator(views::Separator::HORIZONTAL));
 
   // Adds Gaia signin webview
   Profile* profile = browser_->profile();
   views::WebView* web_view = new views::WebView(profile);
   signin::Source source = add_secondary_account ?
       signin::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT :
       signin::SOURCE_AVATAR_BUBBLE_SIGN_IN;
   GURL url(signin::GetPromoURL(
       source, false /* auto_close */, true /* is_constrained */));
   web_view->LoadInitialURL(url);
-  web_view->SetPreferredSize(gfx::Size(available_width, kFixedGaiaViewHeight));
+  web_view->SetPreferredSize(
+      gfx::Size(kFixedGaiaViewWidth, kFixedGaiaViewHeight));
 
   layout->StartRow(1, 0);
   layout->AddView(web_view);
-  layout->StartRowWithPadding(1, 0, 0, views::kRelatedControlVerticalSpacing);
+
   return view;
 }
 
 views::View* ProfileChooserView::CreateAccountRemovalView() {
   views::View* view = new views::View();
   views::GridLayout* layout = CreateSingleColumnLayout(
       view, kFixedAccountRemovalViewWidth - 2 * views::kButtonHEdgeMarginNew);
   layout->SetInsets(views::kButtonVEdgeMarginNew,
                     views::kButtonHEdgeMarginNew,
                     views::kButtonVEdgeMarginNew,
@@ skipping 34 matching lines @@
     layout->StartRowWithPadding(
         1, 0, 0, views::kUnrelatedControlVerticalSpacing);
     layout->AddView(remove_account_and_relaunch_button_);
   } else {
     layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
   }
 
   return view;
 }