Merge TextButton and LabelButton border images util structs, etc.

ui/views/controls/button/text_button.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
 #define UI_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/string16.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/custom_button.h"
+#include "ui/views/controls/button/border_images.h"

[tfarina, 2012/10/26 00:38:12]

nit: sort

[msw, 2012/10/27 07:40:57]

Done.

 #include "ui/views/native_theme_delegate.h"
 
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // TextButtonBorder
 //
 //  A Border subclass that paints a TextButton's background layer -
 //  basically the button frame in the hot/pushed states.
 //
 // Note that this type of button is not focusable by default and will not be
 // part of the focus chain.  Call set_focusable(true) to make it part of the
 // focus chain.
 //
 ////////////////////////////////////////////////////////////////////////////////
 class VIEWS_EXPORT TextButtonBorder : public Border {
  public:
   TextButtonBorder();
   virtual ~TextButtonBorder();
 
   // By default BS_NORMAL is drawn with no border.  Call this to instead draw it
   // with the same border as the "hot" state.
   // TODO(pkasting): You should also call set_animate_on_state_change(false) on
   // the button in this case... we should fix this.
   void copy_normal_set_to_hot_set() { set_normal_set(hot_set_); }
 
  protected:
-  struct BorderImageSet {
-    const gfx::ImageSkia* top_left;
-    const gfx::ImageSkia* top;
-    const gfx::ImageSkia* top_right;
-    const gfx::ImageSkia* left;
-    const gfx::ImageSkia* center;
-    const gfx::ImageSkia* right;
-    const gfx::ImageSkia* bottom_left;
-    const gfx::ImageSkia* bottom;
-    const gfx::ImageSkia* bottom_right;
-  };
+  void set_normal_set(const BorderImages& set) { normal_set_ = set; }
+  void set_hot_set(const BorderImages& set) { hot_set_ = set; }
+  void set_pushed_set(const BorderImages& set) { pushed_set_ = set; }
 
-  void Paint(const View& view,
-             gfx::Canvas* canvas,
-             const BorderImageSet& set) const;
-
-  void set_normal_set(const BorderImageSet& set) { normal_set_ = set; }
-  void set_hot_set(const BorderImageSet& set) { hot_set_ = set; }
-  void set_pushed_set(const BorderImageSet& set) { pushed_set_ = set; }
   void set_vertical_padding(int vertical_padding) {
     vertical_padding_ = vertical_padding;
   }
 
  private:
   // Border:
   virtual void Paint(const View& view, gfx::Canvas* canvas) const OVERRIDE;
   virtual void GetInsets(gfx::Insets* insets) const OVERRIDE;
 
-  BorderImageSet normal_set_;
-  BorderImageSet hot_set_;
-  BorderImageSet pushed_set_;
+  BorderImages normal_set_;
+  BorderImages hot_set_;
+  BorderImages pushed_set_;
 
   int vertical_padding_;
 
   DISALLOW_COPY_AND_ASSIGN(TextButtonBorder);
 };
 
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // TextButtonNativeThemeBorder
@@ skipping 329 matching lines @@
   // Overridden from TextButton:
   virtual void GetExtraParams(
       ui::NativeTheme::ExtraParams* params) const OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(NativeTextButton);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_