[reland] views: Move MenuButton from TextButton to LabelButton.

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 "chrome/browser/ui/libgtk2ui/gtk2_util.h"
 #include "chrome/browser/ui/libgtk2ui/native_theme_gtk2.h"
 #include "third_party/skia/include/effects/SkLerpXfermode.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/animation/animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia_source.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/controls/button/label_button.h"
+#include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/native_theme_delegate.h"
 
 using views::Button;
 using views::NativeThemeDelegate;
 
 namespace libgtk2ui {
 
 namespace {
 
 const int kNumberOfFocusedStates = 2;
@@ skipping 26 matching lines @@
   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)
+                       scoped_ptr<views::LabelButtonBorder> border)
     : gtk2_ui_(gtk2_ui),
       owning_button_(owning_button),
       border_(border.Pass()),
       observer_manager_(this) {
   observer_manager_.Add(NativeThemeGtk2::instance());
 }
 
 Gtk2Border::~Gtk2Border() {
 }
 
@@ skipping 48 matching lines @@
   owning_button_->InvalidateLayout();
 }
 
 void Gtk2Border::PaintState(const ui::NativeTheme::State state,
                             const ui::NativeTheme::ExtraParams& extra,
                             const gfx::Rect& rect,
                             gfx::Canvas* canvas) {
   bool focused = extra.button.is_focused;
   Button::ButtonState views_state = Button::GetButtonStateFrom(state);
 
-  if (ShouldDrawBorder(focused, views_state)) {
+  if (border_->GetPainter(focused, views_state) ||
+      (focused && border_->GetPainter(false, views_state))) {
     gfx::ImageSkia* image = &button_images_[focused][views_state];
 
     if (image->isNull() || image->size() != rect.size()) {
       GtkStateType gtk_state = GetGtkState(state);
       *image = gfx::ImageSkia(
           new ButtonImageSkiaSource(gtk2_ui_, gtk_state, focused, rect.size()),
           rect.size());
     }
     canvas->DrawImageInt(*image, rect.x(), rect.y());
   }
 }
 
-bool Gtk2Border::ShouldDrawBorder(bool focused,
-                                  views::Button::ButtonState state) {
-  // This logic should be kept in sync with the LabelButtonBorder constructor.
-  if (owning_button_->style() == Button::STYLE_BUTTON) {
-    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