views: Migrate the cases of "new .*NativeTextButton(" to LabelButton.

chrome/browser/ui/views/fullscreen_exit_bubble_views.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/fullscreen_exit_bubble_views.h"
 
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/ui_strings.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/bubble/bubble_border.h"
-#include "ui/views/controls/button/text_button.h"
+#include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include "ui/base/l10n/l10n_util_win.h"
 #endif
 
 // FullscreenExitView ----------------------------------------------------------
 
 namespace {
+
 // Space between the site info label and the buttons / link.
 const int kMiddlePaddingPx = 30;
 
 class ButtonView : public views::View {
  public:
   ButtonView(views::ButtonListener* listener, int between_button_spacing);
   virtual ~ButtonView();
 
   // Returns an empty size when the view is not visible.
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
-  views::NativeTextButton* accept_button() const { return accept_button_; }
-  views::NativeTextButton* deny_button() const { return deny_button_; }
+  views::LabelButton* accept_button() { return accept_button_; }
+  views::LabelButton* deny_button() { return deny_button_; }
 
  private:
-  views::NativeTextButton* accept_button_;
-  views::NativeTextButton* deny_button_;
+  views::LabelButton* accept_button_;
+  views::LabelButton* deny_button_;
+
+  DISALLOW_COPY_AND_ASSIGN(ButtonView);
 };
 
 ButtonView::ButtonView(views::ButtonListener* listener,
-                       int between_button_spacing) : accept_button_(NULL),
-                                                     deny_button_(NULL) {
-  accept_button_ = new views::NativeTextButton(listener);
+                       int between_button_spacing)
+    : accept_button_(NULL),
+      deny_button_(NULL) {
+  accept_button_ = new views::LabelButton(listener, string16());
+  accept_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
   accept_button_->set_focusable(false);
   AddChildView(accept_button_);
 
-  deny_button_ = new views::NativeTextButton(listener);
+  deny_button_ = new views::LabelButton(listener, string16());
+  deny_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
   deny_button_->set_focusable(false);
   AddChildView(deny_button_);
 
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0,
                                         between_button_spacing));
 }
 
 ButtonView::~ButtonView() {
 }
 
@@ skipping 133 matching lines @@
     const GURL& url,
     FullscreenExitBubbleType bubble_type) {
   DCHECK_NE(FEB_TYPE_NONE, bubble_type);
 
   message_label_->SetText(bubble_->GetCurrentMessageText());
   if (fullscreen_bubble::ShowButtonsForType(bubble_type)) {
     link_->SetVisible(false);
     mouse_lock_exit_instruction_->SetVisible(false);
     button_view_->SetVisible(true);
     button_view_->deny_button()->SetText(bubble_->GetCurrentDenyButtonText());
-    button_view_->deny_button()->ClearMaxTextSize();
+    button_view_->deny_button()->set_max_size(gfx::Size());

[msw, 2013/04/04 02:31:03]

It's a little confusing, but the TextButton::ClearMaxTextSize() call actually
translates to LabelButton::set_min_size(gfx::Size()), since the idea is to
ignore the lower bound on the size set by potentially larger previous strings.

[tfarina, 2013/04/04 22:36:52]

Removed.

[msw, 2013/04/04 22:41:16]

Incorrect; it should be changed to set_min_size(gfx::Size()).

[tfarina, 2013/04/05 00:10:38]

Done.

   } else {
     bool link_visible = true;
     string16 accelerator;
     if (bubble_type == FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION ||
         bubble_type == FEB_TYPE_BROWSER_EXTENSION_FULLSCREEN_EXIT_INSTRUCTION) {
       accelerator = browser_fullscreen_exit_accelerator_;
     } else if (bubble_type == FEB_TYPE_FULLSCREEN_EXIT_INSTRUCTION) {
       accelerator = l10n_util::GetStringUTF16(IDS_APP_ESC_KEY);
     } else {
       link_visible = false;
@@ skipping 157 matching lines @@
 }
 
 bool FullscreenExitBubbleViews::IsAnimating() {
   return size_animation_->GetCurrentValue() != 0;
 }
 
 void FullscreenExitBubbleViews::StartWatchingMouseIfNecessary() {
   if (!fullscreen_bubble::ShowButtonsForType(bubble_type_))
     StartWatchingMouse();
 }