views: Convert one_click_signin_bubble_view* to LabelButton.

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.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/button/image_button.h"
-#include "ui/views/controls/button/text_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 for the mutli-line label.
 const int kMinimumDialogLabelWidth = 400;
 const int kMinimumLabelWidth = 240;
@@ skipping 15 matching lines @@
       content::WebContents* web_content,
       views::View* anchor_view,
       const BrowserWindow::StartSyncCallback& start_sync_callback);
 
  private:
   // Overridden from views::WidgetDelegate:
   virtual ui::ModalType GetModalType() const OVERRIDE;
 
   // Overridden from OneClickSigninBubbleView:
   virtual void InitContent(views::GridLayout* layout) OVERRIDE;
-  virtual void GetButtons(views::TextButton** ok_button,
-                          views::TextButton** undo_button) OVERRIDE;
+  virtual void GetButtons(views::LabelButton** ok_button,
+                          views::LabelButton** undo_button) OVERRIDE;
   virtual views::Link* GetAdvancedLink() OVERRIDE;
 
   // Overridden from views::LinkListener:
   virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE;
 
   content::WebContents* web_content_;
   views::Link* learn_more_link_;
   views::ImageButton* close_button_;
 
   DISALLOW_COPY_AND_ASSIGN(OneClickSigninDialogView);
@@ skipping 66 matching lines @@
         l10n_util::GetStringUTF16(IDS_LEARN_MORE));
     learn_more_link_->set_listener(this);
     learn_more_link_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     layout->AddView(learn_more_link_, 1, 1, views::GridLayout::TRAILING,
                     views::GridLayout::CENTER);
   }
 
   layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
 }
 
-void OneClickSigninDialogView::GetButtons(views::TextButton** ok_button,
-                                          views::TextButton** undo_button) {
-  *ok_button = new views::NativeTextButton(this);
-  *undo_button = new views::NativeTextButton(this);
+void OneClickSigninDialogView::GetButtons(views::LabelButton** ok_button,
+                                          views::LabelButton** undo_button) {
+  *ok_button = new views::LabelButton(this, string16());
+  (*ok_button)->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
+
+  *undo_button = new views::LabelButton(this, string16());
+  (*undo_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.  Furthermore, to make sure they are the
   // same size, SetText() is called with both strings on both buttons.
-  (*ok_button)->set_ignore_minimum_size(true);
-  (*undo_button)->set_ignore_minimum_size(true);
+  (*ok_button)->set_min_size(gfx::Size());
+  (*undo_button)->set_min_size(gfx::Size());
   string16 ok_label =
       l10n_util::GetStringUTF16(IDS_ONE_CLICK_SIGNIN_DIALOG_OK_BUTTON);
   string16 undo_label =
       l10n_util::GetStringUTF16(IDS_ONE_CLICK_SIGNIN_DIALOG_UNDO_BUTTON);
   (*ok_button)->SetText(undo_label);
   (*ok_button)->SetText(ok_label);
   (*undo_button)->SetText(ok_label);
   (*undo_button)->SetText(undo_label);
 }
 
@@ skipping 116 matching lines @@
   label->SetMultiLine(true);
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   label->SizeToFit(kMinimumLabelWidth);
 
   layout->StartRow(0, COLUMN_SET_FILL_ALIGN);
   layout->AddView(label);
 
   layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
 }
 
-void OneClickSigninBubbleView::GetButtons(views::TextButton** ok_button,
-                                          views::TextButton** undo_button) {
-  *ok_button = new views::NativeTextButton(this);
-  *undo_button = new views::NativeTextButton(this);
+void OneClickSigninBubbleView::GetButtons(views::LabelButton** ok_button,
+                                          views::LabelButton** undo_button) {
+  *ok_button = new views::LabelButton(this, string16());
+  (*ok_button)->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
+
+  *undo_button = new views::LabelButton(this, string16());
+  (*undo_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.  Furthermore, to make sure they are the
   // same size, SetText() is called with both strings on both buttons.
-  (*ok_button)->set_ignore_minimum_size(true);
-  (*undo_button)->set_ignore_minimum_size(true);
+  (*ok_button)->set_min_size(gfx::Size());
+  (*undo_button)->set_min_size(gfx::Size());
   string16 ok_label = l10n_util::GetStringUTF16(IDS_OK);
   string16 undo_label = l10n_util::GetStringUTF16(IDS_ONE_CLICK_BUBBLE_UNDO);
   (*ok_button)->SetText(undo_label);
   (*ok_button)->SetText(ok_label);
   (*undo_button)->SetText(ok_label);
   (*undo_button)->SetText(undo_label);
 }
 
 views::Link* OneClickSigninBubbleView::GetAdvancedLink() {
   views::Link* advanced_link= new views::Link(
@@ skipping 41 matching lines @@
       OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST);
 }
 
 void OneClickSigninBubbleView::ButtonPressed(views::Button* sender,
                                              const ui::Event& event) {
   StartFade(false);
   base::ResetAndReturn(&start_sync_callback_).Run((sender == ok_button_) ?
       OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS :
       OneClickSigninSyncStarter::UNDO_SYNC);
 }