linux_aura: Fix all instances of LabelButton sizing.

Previous attempts at fixing this involved tracking down each button
which was setting the minimum size to 0,0. Those attempts are reverted,
as I no longer think they're wrong. The actual fix is to pass through
the views inset size instead of using the GTK inset size.

BUG=349183, 344498, 339247
R=msw@chromium.org, sky@chromium.org

Review URL: https://codereview.chromium.org/187133003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255091 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 3 insertions, 8 deletions

diff --git a/chrome/browser/ui/libgtk2ui/gtk2_border.cc b/chrome/browser/ui/libgtk2ui/gtk2_border.cc
index 9648a69..0ef1d97 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_border.cc
+++ b/chrome/browser/ui/libgtk2ui/gtk2_border.cc
@@ -120,11 +120,7 @@ void Gtk2Border::Paint(const views::View& view, gfx::Canvas* canvas) {
 }
 
 gfx::Insets Gtk2Border::GetInsets() const {
-  ui::ThemeProvider* provider = owning_button_->GetThemeProvider();
-  if (!provider || !provider->UsingNativeTheme())
-    return border_->GetInsets();
-
-  return gtk2_ui_->GetButtonInsets();
+  return border_->GetInsets();
 }
 
 gfx::Size Gtk2Border::GetMinimumSize() const {
diff --git a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc
index f3e56ab..ecdb2c0 100644
--- a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc
+++ b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc
@@ -224,8 +224,8 @@ void FullscreenExitBubbleViews::FullscreenExitView::UpdateContent(
     link_->SetVisible(false);
     mouse_lock_exit_instruction_->SetVisible(false);
     button_view_->SetVisible(true);
-    button_view_->deny_button()->SetStyle(views::Button::STYLE_BUTTON);
     button_view_->deny_button()->SetText(bubble_->GetCurrentDenyButtonText());
+    button_view_->deny_button()->set_min_size(gfx::Size());
   } else {
     bool link_visible = true;
     base::string16 accelerator;
diff --git a/ui/views/controls/button/label_button.h b/ui/views/controls/button/label_button.h
index 7f602fa..2359dbc 100644
--- a/ui/views/controls/button/label_button.h
+++ b/ui/views/controls/button/label_button.h
@@ -61,7 +61,6 @@ class VIEWS_EXPORT LabelButton : public CustomButton,
 
   // Call set_min_size(gfx::Size()) to clear the monotonically increasing size.
   void set_min_size(const gfx::Size& min_size) { min_size_ = min_size; }
-  void set_min_width(const int min_width) { min_size_.set_width(min_width); }
   void set_max_size(const gfx::Size& max_size) { max_size_ = max_size; }
 
   // Get or set the option to handle the return key; false by default.
diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc
index d75ae1f..cdcc98ef 100644
--- a/ui/views/window/dialog_client_view.cc
+++ b/ui/views/window/dialog_client_view.cc
@@ -383,7 +383,7 @@ LabelButton* DialogClientView::CreateDialogButton(ui::DialogButton type) {
   button->SetFocusable(true);
 
   const int kDialogMinButtonWidth = 75;
-  button->set_min_width(kDialogMinButtonWidth);
+  button->set_min_size(gfx::Size(kDialogMinButtonWidth, 0));
   button->SetGroup(kButtonGroup);
   return button;
 }