Move controls into their own dir under chrome/views/controls

TBR=sky

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

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

18 files changed, 47 insertions, 47 deletions

diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc
index fb5ed93..45e0cc2 100644
--- a/chrome/browser/views/options/advanced_contents_view.cc
+++ b/chrome/browser/views/options/advanced_contents_view.cc
@@ -34,10 +34,10 @@
 #include "chrome/common/resource_bundle.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "chrome/views/background.h"
-#include "chrome/views/checkbox.h"
-#include "chrome/views/combo_box.h"
+#include "chrome/views/controls/button/checkbox.h"
+#include "chrome/views/controls/combo_box.h"
+#include "chrome/views/controls/scroll_view.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/scroll_view.h"
 #include "chrome/views/widget/widget.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/views/options/advanced_page_view.cc b/chrome/browser/views/options/advanced_page_view.cc
index c2ac09f..9e9f1e3 100644
--- a/chrome/browser/views/options/advanced_page_view.cc
+++ b/chrome/browser/views/options/advanced_page_view.cc
@@ -13,10 +13,10 @@
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
+#include "chrome/views/controls/message_box_view.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/scroll_view.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/message_box_view.h"
-#include "chrome/views/native_button.h"
-#include "chrome/views/scroll_view.h"
 #include "chrome/views/window/dialog_delegate.h"
 #include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
diff --git a/chrome/browser/views/options/advanced_page_view.h b/chrome/browser/views/options/advanced_page_view.h
index ac2fb80..54aa8a1 100644
--- a/chrome/browser/views/options/advanced_page_view.h
+++ b/chrome/browser/views/options/advanced_page_view.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_VIEWS_OPTIONS_ADVANCED_PAGE_VIEW_H_
 
 #include "chrome/browser/views/options/options_page_view.h"
-#include "chrome/views/native_button.h"
+#include "chrome/views/controls/button/native_button.h"
 
 class AdvancedOptionsListModel;
 class AdvancedScrollViewContainer;
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc
index 70f6f36..18a7550 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -23,11 +23,11 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
-#include "chrome/views/checkbox.h"
+#include "chrome/views/controls/button/checkbox.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/button/radio_button.h"
+#include "chrome/views/controls/text_field.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/native_button.h"
-#include "chrome/views/radio_button.h"
-#include "chrome/views/text_field.h"
 #include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/views/options/content_page_view.h b/chrome/browser/views/options/content_page_view.h
index ed9b45b..3d68bb5 100644
--- a/chrome/browser/views/options/content_page_view.h
+++ b/chrome/browser/views/options/content_page_view.h
@@ -8,7 +8,7 @@
 #include "chrome/browser/views/options/options_page_view.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/common/pref_member.h"
-#include "chrome/views/native_button.h"
+#include "chrome/views/controls/button/native_button.h"
 #include "chrome/views/view.h"
 
 namespace views {
diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc
index 594e5e2..e31fc1e0 100644
--- a/chrome/browser/views/options/cookies_view.cc
+++ b/chrome/browser/views/options/cookies_view.cc
@@ -17,9 +17,9 @@
 #include "chrome/common/win_util.h"
 #include "chrome/views/border.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/label.h"
-#include "chrome/views/text_field.h"
-#include "chrome/views/table_view.h"
+#include "chrome/views/controls/label.h"
+#include "chrome/views/controls/text_field.h"
+#include "chrome/views/controls/table/table_view.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/views/options/cookies_view.h b/chrome/browser/views/options/cookies_view.h
index 1f300cb..1c6aacc 100644
--- a/chrome/browser/views/options/cookies_view.h
+++ b/chrome/browser/views/options/cookies_view.h
@@ -6,9 +6,9 @@
 #define CHROME_BROWSER_VIEWS_OPTIONS_COOKIES_VIEW_H__
 
 #include "base/task.h"
-#include "chrome/views/native_button.h"
-#include "chrome/views/table_view.h"
-#include "chrome/views/text_field.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/table/table_view.h"
+#include "chrome/views/controls/text_field.h"
 #include "chrome/views/view.h"
 #include "chrome/views/window/dialog_delegate.h"
 #include "chrome/views/window/window.h"
diff --git a/chrome/browser/views/options/fonts_languages_window_view.h b/chrome/browser/views/options/fonts_languages_window_view.h
index 0ddc3d5..5d0fae3 100644
--- a/chrome/browser/views/options/fonts_languages_window_view.h
+++ b/chrome/browser/views/options/fonts_languages_window_view.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_FONTS_LANGUAGE_WINDOW_H__
 #define CHROME_BROWSER_FONTS_LANGUAGE_WINDOW_H__
 
-#include "chrome/views/tabbed_pane.h"
+#include "chrome/views/controls/tabbed_pane.h"
 #include "chrome/views/view.h"
 #include "chrome/views/window/dialog_delegate.h"
 #include "chrome/views/window/window.h"
diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc
index a3a31e9..d33b23c 100644
--- a/chrome/browser/views/options/fonts_page_view.cc
+++ b/chrome/browser/views/options/fonts_page_view.cc
@@ -24,11 +24,11 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
-#include "chrome/views/checkbox.h"
+#include "chrome/views/controls/button/checkbox.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/button/radio_button.h"
+#include "chrome/views/controls/text_field.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/native_button.h"
-#include "chrome/views/radio_button.h"
-#include "chrome/views/text_field.h"
 #include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/views/options/fonts_page_view.h b/chrome/browser/views/options/fonts_page_view.h
index ddc0e62..eb348e6 100644
--- a/chrome/browser/views/options/fonts_page_view.h
+++ b/chrome/browser/views/options/fonts_page_view.h
@@ -8,8 +8,8 @@
 #include "chrome/browser/views/options/options_page_view.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/common/pref_member.h"
-#include "chrome/views/combo_box.h"
-#include "chrome/views/native_button.h"
+#include "chrome/views/controls/combo_box.h"
+#include "chrome/views/controls/button/native_button.h"
 #include "chrome/views/view.h"
 
 
diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc
index 3fbc161c..a1abb9b 100644
--- a/chrome/browser/views/options/general_page_view.cc
+++ b/chrome/browser/views/options/general_page_view.cc
@@ -28,12 +28,12 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
-#include "chrome/views/checkbox.h"
+#include "chrome/views/controls/button/checkbox.h"
+#include "chrome/views/controls/button/radio_button.h"
+#include "chrome/views/controls/label.h"
+#include "chrome/views/controls/table/table_view.h"
+#include "chrome/views/controls/text_field.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/label.h"
-#include "chrome/views/radio_button.h"
-#include "chrome/views/table_view.h"
-#include "chrome/views/text_field.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/views/options/general_page_view.h b/chrome/browser/views/options/general_page_view.h
index 9bee7fe..eea9cf1 100644
--- a/chrome/browser/views/options/general_page_view.h
+++ b/chrome/browser/views/options/general_page_view.h
@@ -8,8 +8,8 @@
 #include "chrome/browser/views/options/options_page_view.h"
 #include "chrome/browser/views/shelf_item_dialog.h"
 #include "chrome/common/pref_member.h"
-#include "chrome/views/combo_box.h"
-#include "chrome/views/native_button.h"
+#include "chrome/views/controls/combo_box.h"
+#include "chrome/views/controls/button/native_button.h"
 #include "chrome/views/view.h"
 
 namespace views {
diff --git a/chrome/browser/views/options/language_combobox_model.h b/chrome/browser/views/options/language_combobox_model.h
index de23de8..e10af90 100644
--- a/chrome/browser/views/options/language_combobox_model.h
+++ b/chrome/browser/views/options/language_combobox_model.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_VIEWS_OPTIONS_LANGUAGE_COMBOBOX_MODEL_H__
 
 #include "chrome/browser/profile.h"
-#include "chrome/views/combo_box.h"
+#include "chrome/views/controls/combo_box.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // LanguageComboboxModel
diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc
index e0d137a..b156523 100644
--- a/chrome/browser/views/options/languages_page_view.cc
+++ b/chrome/browser/views/options/languages_page_view.cc
@@ -25,13 +25,13 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
-#include "chrome/views/checkbox.h"
-#include "chrome/views/combo_box.h"
+#include "chrome/views/controls/button/checkbox.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/button/radio_button.h"
+#include "chrome/views/controls/combo_box.h"
+#include "chrome/views/controls/tabbed_pane.h"
+#include "chrome/views/controls/text_field.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/native_button.h"
-#include "chrome/views/radio_button.h"
-#include "chrome/views/tabbed_pane.h"
-#include "chrome/views/text_field.h"
 #include "chrome/views/widget/widget.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/views/options/languages_page_view.h b/chrome/browser/views/options/languages_page_view.h
index 9623317..a58cb99 100644
--- a/chrome/browser/views/options/languages_page_view.h
+++ b/chrome/browser/views/options/languages_page_view.h
@@ -7,9 +7,9 @@
 
 #include "chrome/browser/views/options/options_page_view.h"
 #include "chrome/common/pref_member.h"
-#include "chrome/views/combo_box.h"
-#include "chrome/views/native_button.h"
-#include "chrome/views/table_view.h"
+#include "chrome/views/controls/combo_box.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/controls/table/table_view.h"
 #include "chrome/views/view.h"
 
 namespace views {
diff --git a/chrome/browser/views/options/options_group_view.cc b/chrome/browser/views/options/options_group_view.cc
index 19d3887..c666f2a 100644
--- a/chrome/browser/views/options/options_group_view.cc
+++ b/chrome/browser/views/options/options_group_view.cc
@@ -14,8 +14,8 @@
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/grid_layout.h"
-#include "chrome/views/label.h"
-#include "chrome/views/separator.h"
+#include "chrome/views/controls/label.h"
+#include "chrome/views/controls/separator.h"
 #include "grit/locale_settings.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/browser/views/options/options_page_view.h b/chrome/browser/views/options/options_page_view.h
index ecb403d..6c7c4fd 100644
--- a/chrome/browser/views/options/options_page_view.h
+++ b/chrome/browser/views/options/options_page_view.h
@@ -8,8 +8,8 @@
 #include "chrome/browser/options_window.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/notification_observer.h"
-#include "chrome/views/link.h"
-#include "chrome/views/native_button.h"
+#include "chrome/views/controls/link.h"
+#include "chrome/views/controls/button/native_button.h"
 
 class PrefService;
 
diff --git a/chrome/browser/views/options/options_window_view.cc b/chrome/browser/views/options/options_window_view.cc
index bd423ec..f7f492f 100644
--- a/chrome/browser/views/options/options_window_view.cc
+++ b/chrome/browser/views/options/options_window_view.cc
@@ -18,7 +18,7 @@
 #include "chrome/personalization/personalization.h"
 #include "chrome/personalization/views/user_data_page_view.h"
 #endif
-#include "chrome/views/tabbed_pane.h"
+#include "chrome/views/controls/tabbed_pane.h"
 #include "chrome/views/widget/root_view.h"
 #include "chrome/views/window/dialog_delegate.h"
 #include "chrome/views/window/window.h"