Linux Aura: Use appropriate button style depending on aura/gtk NativeTheme

chrome/browser/ui/libgtk2ui/gtk2_border.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/libgtk2ui/gtk2_border.h"
 
 #include <gtk/gtk.h>
 
 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h"
 #include "third_party/skia/include/effects/SkLerpXfermode.h"
@@ skipping 53 matching lines @@
   const GtkStateType state_;
   const bool focused_;
   const gfx::Size size_;
 
   DISALLOW_COPY_AND_ASSIGN(ButtonImageSkiaSource);
 };
 
 }  // namespace
 
 Gtk2Border::Gtk2Border(Gtk2UI* gtk2_ui,
-                       views::LabelButton* owning_button,
-                       scoped_ptr<views::Border> border)
+                       views::LabelButton* owning_button)
     : gtk2_ui_(gtk2_ui),
-      owning_button_(owning_button),
-      border_(border.Pass()) {
+      owning_button_(owning_button) {
   gtk2_ui_->AddNativeThemeChangeObserver(this);
 }
 
 Gtk2Border::~Gtk2Border() {
   gtk2_ui_->RemoveNativeThemeChangeObserver(this);
 }
 
 void Gtk2Border::Paint(const views::View& view, gfx::Canvas* canvas) {
-  ui::ThemeProvider* provider = owning_button_->GetThemeProvider();
-  if (!provider || !provider->UsingNativeTheme()) {
-    border_->Paint(view, canvas);
-    return;
-  }
-
   DCHECK_EQ(&view, owning_button_);
   const NativeThemeDelegate* native_theme_delegate = owning_button_;
   gfx::Rect rect(native_theme_delegate->GetThemePaintRect());
   ui::NativeTheme::ExtraParams extra;
   ui::NativeTheme::State state = native_theme_delegate->GetThemeState(&extra);
 
   const gfx::Animation* animation = native_theme_delegate->GetThemeAnimation();
   if (animation && animation->is_animating()) {
     // Linearly interpolate background and foreground painters during animation.
     const SkRect sk_rect = gfx::RectToSkRect(rect);
@@ skipping 10 matching lines @@
     PaintState(state, extra, rect, canvas);
     canvas->sk_canvas()->restore();
 
     canvas->sk_canvas()->restore();
   } else {
     PaintState(state, extra, rect, canvas);
   }
 }
 
 gfx::Insets Gtk2Border::GetInsets() const {
-  // TODO(erg): We want to differentiate between buttons on the toolbar and
-  // buttons everywhere else. Right now, the only way to do this is to check
-  // the style. STYLE_BUTTON is the button style used in dialogs, and
-  // STYLE_TEXTUBTTON is the button style used in the toolbar, including all
-  // the buttons which are just toolbar images.
-  ui::ThemeProvider* provider = owning_button_->GetThemeProvider();
-  if (owning_button_->style() == views::Button::STYLE_BUTTON ||
-      (!provider || !provider->UsingNativeTheme()))
-    return border_->GetInsets();
-
   // On STYLE_TEXTUBTTON, we want the smaller insets so we can fit the GTK icon
   // in the toolbar without cutting off the edges of the GTK image.
   return gtk2_ui_->GetButtonInsets();
 }
 
 gfx::Size Gtk2Border::GetMinimumSize() const {
-  ui::ThemeProvider* provider = owning_button_->GetThemeProvider();
-  if (!provider || !provider->UsingNativeTheme())
-    return border_->GetMinimumSize();
-
   gfx::Insets insets = GetInsets();
   return gfx::Size(insets.width(), insets.height());
 }
 
 void Gtk2Border::OnNativeThemeChanged() {
   for (int i = 0; i < kNumberOfFocusedStates; ++i) {
     for (int j = 0; j < views::Button::STATE_COUNT; ++j) {
       button_images_[i][j] = gfx::ImageSkia();
     }
   }
@@ skipping 30 matching lines @@
     return true;
   } else if (owning_button_->style() == Button::STYLE_TEXTBUTTON) {
     return focused == false && (state == Button::STATE_HOVERED ||
                                 state == Button::STATE_PRESSED);
   }
 
   return false;
 }
 
 }  // namespace libgtk2ui