views: Move button directory to ui/views/controls/.

BUG=104039
R=maruel@chromium.org
TBR=ben@chromium.org

Review URL: http://codereview.chromium.org/8716001

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

27 files changed, 29 insertions, 29 deletions

diff --git a/ui/views/examples/bubble_example.cc b/ui/views/examples/bubble_example.cc
index 8f591e1..2341447 100644
--- a/ui/views/examples/bubble_example.cc
+++ b/ui/views/examples/bubble_example.cc
@@ -6,10 +6,10 @@
 
 #include "base/utf_string_conversions.h"
 #include "ui/views/bubble/bubble_delegate.h"
+#include "ui/views/controls/button/text_button.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
-#include "views/controls/button/text_button.h"
 #include "views/controls/label.h"
 
 namespace examples {
diff --git a/ui/views/examples/bubble_example.h b/ui/views/examples/bubble_example.h
index 9c7e1c7..b62d9e8 100644
--- a/ui/views/examples/bubble_example.h
+++ b/ui/views/examples/bubble_example.h
@@ -6,8 +6,8 @@
 #define UI_VIEWS_EXAMPLES_BUBBLE_EXAMPLE_H_
 #pragma once
 
+#include "ui/views/controls/button/button.h"
 #include "ui/views/examples/example_base.h"
-#include "views/controls/button/button.h"
 
 namespace examples {
 
diff --git a/ui/views/examples/button_example.cc b/ui/views/examples/button_example.cc
index 4ef0534..a0ad78d 100644
--- a/ui/views/examples/button_example.cc
+++ b/ui/views/examples/button_example.cc
@@ -7,8 +7,8 @@
 #include "base/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/views/controls/button/checkbox.h"
 #include "ui/views/layout/fill_layout.h"
-#include "views/controls/button/checkbox.h"
 #include "views/view.h"
 
 namespace examples {
diff --git a/ui/views/examples/button_example.h b/ui/views/examples/button_example.h
index b353105..f6298ff 100644
--- a/ui/views/examples/button_example.h
+++ b/ui/views/examples/button_example.h
@@ -8,8 +8,8 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/views/controls/button/text_button.h"
 #include "ui/views/examples/example_base.h"
-#include "views/controls/button/text_button.h"
 
 namespace views {
 class View;
diff --git a/ui/views/examples/examples_main.cc b/ui/views/examples/examples_main.cc
index b776c60..1c874b3 100644
--- a/ui/views/examples/examples_main.cc
+++ b/ui/views/examples/examples_main.cc
@@ -12,6 +12,7 @@
 #include "base/utf_string_conversions.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
+#include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/tabbed_pane/tabbed_pane.h"
 #include "ui/views/examples/bubble_example.h"
 #include "ui/views/examples/button_example.h"
@@ -36,7 +37,6 @@
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/test/test_views_delegate.h"
 #include "ui/views/widget/widget.h"
-#include "views/controls/button/text_button.h"
 #include "views/controls/label.h"
 
 #if defined(OS_WIN)
diff --git a/ui/views/examples/menu_example.cc b/ui/views/examples/menu_example.cc
index 54346a2..fd20aee 100644
--- a/ui/views/examples/menu_example.cc
+++ b/ui/views/examples/menu_example.cc
@@ -8,9 +8,9 @@
 
 #include "base/utf_string_conversions.h"
 #include "ui/base/models/simple_menu_model.h"
+#include "ui/views/controls/button/menu_button.h"
+#include "ui/views/controls/button/text_button.h"
 #include "ui/views/layout/fill_layout.h"
-#include "views/controls/button/menu_button.h"
-#include "views/controls/button/text_button.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/controls/menu/view_menu_delegate.h"
 #include "views/view.h"
diff --git a/ui/views/examples/message_box_example.h b/ui/views/examples/message_box_example.h
index cc45486..5ab72cc 100644
--- a/ui/views/examples/message_box_example.h
+++ b/ui/views/examples/message_box_example.h
@@ -10,8 +10,8 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/views/controls/button/text_button.h"
 #include "ui/views/examples/example_base.h"
-#include "views/controls/button/text_button.h"
 
 namespace views {
 class MessageBoxView;
diff --git a/ui/views/examples/native_theme_button_example.h b/ui/views/examples/native_theme_button_example.h
index 7a116f1..0940cfc 100644
--- a/ui/views/examples/native_theme_button_example.h
+++ b/ui/views/examples/native_theme_button_example.h
@@ -8,9 +8,9 @@
 
 #include "base/basictypes.h"
 #include "ui/gfx/native_theme.h"
+#include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/examples/example_base.h"
-#include "views/controls/button/custom_button.h"
 #include "views/native_theme_delegate.h"
 #include "views/native_theme_painter.h"
 
diff --git a/ui/views/examples/native_theme_checkbox_example.cc b/ui/views/examples/native_theme_checkbox_example.cc
index 6df2056..c999ccc 100644
--- a/ui/views/examples/native_theme_checkbox_example.cc
+++ b/ui/views/examples/native_theme_checkbox_example.cc
@@ -6,9 +6,9 @@
 
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
+#include "ui/views/controls/button/checkbox.h"
+#include "ui/views/controls/button/radio_button.h"
 #include "ui/views/layout/fill_layout.h"
-#include "views/controls/button/checkbox.h"
-#include "views/controls/button/radio_button.h"
 
 namespace examples {
 
diff --git a/ui/views/examples/native_theme_checkbox_example.h b/ui/views/examples/native_theme_checkbox_example.h
index 4ab6957..557fb75 100644
--- a/ui/views/examples/native_theme_checkbox_example.h
+++ b/ui/views/examples/native_theme_checkbox_example.h
@@ -8,8 +8,8 @@
 
 #include "base/basictypes.h"
 #include "ui/gfx/native_theme.h"
+#include "ui/views/controls/button/button.h"
 #include "ui/views/examples/example_base.h"
-#include "views/controls/button/button.h"
 
 namespace views {
 class Checkbox;
diff --git a/ui/views/examples/native_widget_views_example.cc b/ui/views/examples/native_widget_views_example.cc
index 588257f..c42bc72 100644
--- a/ui/views/examples/native_widget_views_example.cc
+++ b/ui/views/examples/native_widget_views_example.cc
@@ -6,11 +6,11 @@
 
 #include "base/utf_string_conversions.h"
 #include "ui/gfx/canvas.h"
+#include "ui/views/controls/button/text_button.h"
 #include "ui/views/examples/example_base.h"
 #include "ui/views/test/test_views_delegate.h"
 #include "ui/views/widget/native_widget_views.h"
 #include "ui/views/widget/widget.h"
-#include "views/controls/button/text_button.h"
 #include "views/view.h"
 
 namespace examples {
diff --git a/ui/views/examples/progress_bar_example.cc b/ui/views/examples/progress_bar_example.cc
index 14776d5..69cf84d 100644
--- a/ui/views/examples/progress_bar_example.cc
+++ b/ui/views/examples/progress_bar_example.cc
@@ -5,8 +5,8 @@
 #include "ui/views/examples/progress_bar_example.h"
 
 #include "base/utf_string_conversions.h"
+#include "ui/views/controls/button/text_button.h"
 #include "ui/views/layout/grid_layout.h"
-#include "views/controls/button/text_button.h"
 #include "views/controls/progress_bar.h"
 #include "views/view.h"
 
diff --git a/ui/views/examples/progress_bar_example.h b/ui/views/examples/progress_bar_example.h
index 08724b2..54f1247 100644
--- a/ui/views/examples/progress_bar_example.h
+++ b/ui/views/examples/progress_bar_example.h
@@ -8,8 +8,8 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/views/controls/button/button.h"
 #include "ui/views/examples/example_base.h"
-#include "views/controls/button/button.h"
 
 namespace views {
 class ProgressBar;
diff --git a/ui/views/examples/radio_button_example.cc b/ui/views/examples/radio_button_example.cc
index f501fec..1af9918 100644
--- a/ui/views/examples/radio_button_example.cc
+++ b/ui/views/examples/radio_button_example.cc
@@ -6,8 +6,8 @@
 
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
+#include "ui/views/controls/button/text_button.h"
 #include "ui/views/layout/grid_layout.h"
-#include "views/controls/button/text_button.h"
 #include "views/view.h"
 
 namespace examples {
diff --git a/ui/views/examples/radio_button_example.h b/ui/views/examples/radio_button_example.h
index 44e59b1..8d9e072 100644
--- a/ui/views/examples/radio_button_example.h
+++ b/ui/views/examples/radio_button_example.h
@@ -10,8 +10,8 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/views/controls/button/radio_button.h"
 #include "ui/views/examples/example_base.h"
-#include "views/controls/button/radio_button.h"
 
 namespace events {
 class TextButton;
diff --git a/ui/views/examples/scroll_view_example.cc b/ui/views/examples/scroll_view_example.cc
index d085c57..f1eec32 100644
--- a/ui/views/examples/scroll_view_example.cc
+++ b/ui/views/examples/scroll_view_example.cc
@@ -6,8 +6,8 @@
 
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
+#include "ui/views/controls/button/radio_button.h"
 #include "ui/views/layout/grid_layout.h"
-#include "views/controls/button/radio_button.h"
 #include "views/view.h"
 
 namespace examples {
diff --git a/ui/views/examples/scroll_view_example.h b/ui/views/examples/scroll_view_example.h
index 77d618a..54f6cb5 100644
--- a/ui/views/examples/scroll_view_example.h
+++ b/ui/views/examples/scroll_view_example.h
@@ -10,8 +10,8 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/views/controls/button/text_button.h"
 #include "ui/views/examples/example_base.h"
-#include "views/controls/button/text_button.h"
 #include "views/controls/scroll_view.h"
 
 namespace examples {
diff --git a/ui/views/examples/tabbed_pane_example.h b/ui/views/examples/tabbed_pane_example.h
index d5192f2..2b6c9d5 100644
--- a/ui/views/examples/tabbed_pane_example.h
+++ b/ui/views/examples/tabbed_pane_example.h
@@ -8,9 +8,9 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/tabbed_pane/tabbed_pane_listener.h"
 #include "ui/views/examples/example_base.h"
-#include "views/controls/button/text_button.h"
 
 namespace views {
 class TabbedPane;
diff --git a/ui/views/examples/table2_example.cc b/ui/views/examples/table2_example.cc
index a99d5f0..210db6f 100644
--- a/ui/views/examples/table2_example.cc
+++ b/ui/views/examples/table2_example.cc
@@ -6,9 +6,9 @@
 
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkCanvas.h"
+#include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/table/table_view2.h"
 #include "ui/views/layout/grid_layout.h"
-#include "views/controls/button/checkbox.h"
 
 namespace examples {
 
diff --git a/ui/views/examples/table2_example.h b/ui/views/examples/table2_example.h
index 50a05ec..d13c4c2 100644
--- a/ui/views/examples/table2_example.h
+++ b/ui/views/examples/table2_example.h
@@ -12,9 +12,9 @@
 #include "base/compiler_specific.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/models/table_model.h"
+#include "ui/views/controls/button/button.h"
 #include "ui/views/controls/table/table_view_observer.h"
 #include "ui/views/examples/example_base.h"
-#include "views/controls/button/button.h"
 
 namespace views {
 class Checkbox;
diff --git a/ui/views/examples/table_example.cc b/ui/views/examples/table_example.cc
index 7073ad3..a481042 100644
--- a/ui/views/examples/table_example.cc
+++ b/ui/views/examples/table_example.cc
@@ -8,8 +8,8 @@
 
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkCanvas.h"
+#include "ui/views/controls/button/checkbox.h"
 #include "ui/views/layout/grid_layout.h"
-#include "views/controls/button/checkbox.h"
 
 namespace examples {
 
diff --git a/ui/views/examples/table_example.h b/ui/views/examples/table_example.h
index f9e5da6..5244b35 100644
--- a/ui/views/examples/table_example.h
+++ b/ui/views/examples/table_example.h
@@ -12,10 +12,10 @@
 #include "base/compiler_specific.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/models/table_model.h"
+#include "ui/views/controls/button/button.h"
 #include "ui/views/controls/table/table_view.h"
 #include "ui/views/controls/table/table_view_observer.h"
 #include "ui/views/examples/example_base.h"
-#include "views/controls/button/button.h"
 
 namespace views {
 class Checkbox;
diff --git a/ui/views/examples/text_example.cc b/ui/views/examples/text_example.cc
index cac7e1f..a73bbe1 100644
--- a/ui/views/examples/text_example.cc
+++ b/ui/views/examples/text_example.cc
@@ -8,10 +8,10 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia.h"
+#include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/examples/example_combobox_model.h"
 #include "ui/views/layout/grid_layout.h"
-#include "views/controls/button/checkbox.h"
 #include "views/controls/label.h"
 #include "views/view.h"
 
diff --git a/ui/views/examples/text_example.h b/ui/views/examples/text_example.h
index e9e096f..ca5b459 100644
--- a/ui/views/examples/text_example.h
+++ b/ui/views/examples/text_example.h
@@ -8,9 +8,9 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/views/controls/button/button.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/examples/example_base.h"
-#include "views/controls/button/button.h"
 
 namespace views {
 class Checkbox;
diff --git a/ui/views/examples/textfield_example.h b/ui/views/examples/textfield_example.h
index 36d43cd..3ac925b 100644
--- a/ui/views/examples/textfield_example.h
+++ b/ui/views/examples/textfield_example.h
@@ -11,9 +11,9 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/string16.h"
+#include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/examples/example_base.h"
-#include "views/controls/button/text_button.h"
 
 namespace examples {
 
diff --git a/ui/views/examples/widget_example.cc b/ui/views/examples/widget_example.cc
index 0aea09a..bfbf6fb 100644
--- a/ui/views/examples/widget_example.cc
+++ b/ui/views/examples/widget_example.cc
@@ -5,10 +5,10 @@
 #include "ui/views/examples/widget_example.h"
 
 #include "base/utf_string_conversions.h"
+#include "ui/views/controls/button/text_button.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/layout_manager.h"
 #include "ui/views/widget/widget.h"
-#include "views/controls/button/text_button.h"
 #include "views/view.h"
 
 namespace {
diff --git a/ui/views/examples/widget_example.h b/ui/views/examples/widget_example.h
index 4011c48..c491a22 100644
--- a/ui/views/examples/widget_example.h
+++ b/ui/views/examples/widget_example.h
@@ -10,9 +10,9 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/views/controls/button/text_button.h"
 #include "ui/views/examples/example_base.h"
 #include "ui/views/widget/widget.h"
-#include "views/controls/button/text_button.h"
 
 namespace examples {