Merge TextButton and LabelButton border images util structs, etc.

ui/views/controls/button/label_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_LABEL_BUTTON_H_
 #define UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_H_
 
 #include "base/compiler_specific.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/image/image_skia.h"
@@ skipping 37 matching lines @@
   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.
   bool default_button() const { return default_button_; }
   void SetDefaultButton(bool default_button);
 
   // Get or set the option to use a native button appearance; false by default.
   bool native_theme() const { return native_theme_; }
   void SetNativeTheme(bool native_theme);
 
+ private:
+  FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, Init);
+  FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, Label);
+  FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, Image);
+  FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, LabelAndImage);
+
   // Overridden from CustomButton:
   virtual void StateChanged() OVERRIDE;
 
   // Overridden from View:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void Layout() OVERRIDE;
   virtual std::string GetClassName() const OVERRIDE;
   virtual void ChildPreferredSizeChanged(View* child) OVERRIDE;
 
- protected:
   // Overridden from NativeThemeDelegate:
   virtual ui::NativeTheme::Part GetThemePart() const OVERRIDE;
   virtual gfx::Rect GetThemePaintRect() const OVERRIDE;
   virtual ui::NativeTheme::State GetThemeState(
       ui::NativeTheme::ExtraParams* params) const OVERRIDE;
   virtual const ui::Animation* GetThemeAnimation() const OVERRIDE;
   virtual ui::NativeTheme::State GetBackgroundThemeState(
       ui::NativeTheme::ExtraParams* params) const OVERRIDE;
   virtual ui::NativeTheme::State GetForegroundThemeState(
       ui::NativeTheme::ExtraParams* params) const OVERRIDE;
 
   // Fill |params| with information about the button.
   virtual void GetExtraParams(ui::NativeTheme::ExtraParams* params) const;
 
- private:
-  FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, Init);
-  FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, LabelAndImage);
-
   // The image and label shown in the button.
   ImageView* image_;
   Label* label_;
 
   // The images and colors for each button state.
   gfx::ImageSkia button_state_images_[BS_COUNT];
   SkColor button_state_colors_[BS_COUNT];
 
   // |min_size_| increases monotonically with the preferred size.
   gfx::Size min_size_;
   // |max_size_| may be set to clamp the preferred size.
   gfx::Size max_size_;
 
   // Flag indicating default handling of the return key via an accelerator.
   bool default_button_;
 
   // Flag indicating native theme styling (or Views styling) of the button.
   bool native_theme_;
 
   DISALLOW_COPY_AND_ASSIGN(LabelButton);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_H_