summaryrefslogtreecommitdiffstats
path: root/ui/views/focus
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-28 01:32:00 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-28 01:32:00 +0000
commit48977d584e9516d70222e5c9b62c01e3516b5283 (patch)
tree92751c3d38a0db9ca1eb1b5eecf20ff7ab773a97 /ui/views/focus
parent5b14c320879a30f95c2ba55b32b5ab55f56c43c4 (diff)
downloadchromium_src-48977d584e9516d70222e5c9b62c01e3516b5283.zip
chromium_src-48977d584e9516d70222e5c9b62c01e3516b5283.tar.gz
chromium_src-48977d584e9516d70222e5c9b62c01e3516b5283.tar.bz2
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
Diffstat (limited to 'ui/views/focus')
-rw-r--r--ui/views/focus/focus_manager_unittest.cc2
-rw-r--r--ui/views/focus/focus_manager_unittest_win.cc2
-rw-r--r--ui/views/focus/focus_traversal_unittest.cc6
3 files changed, 5 insertions, 5 deletions
diff --git a/ui/views/focus/focus_manager_unittest.cc b/ui/views/focus/focus_manager_unittest.cc
index e17d8f1..1ec6143 100644
--- a/ui/views/focus/focus_manager_unittest.cc
+++ b/ui/views/focus/focus_manager_unittest.cc
@@ -5,12 +5,12 @@
#include "base/utf_string_conversions.h"
#include "ui/base/accelerators/accelerator.h"
#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/views/controls/button/text_button.h"
#include "ui/views/controls/textfield/textfield.h"
#include "ui/views/focus/accelerator_handler.h"
#include "ui/views/focus/focus_manager_factory.h"
#include "ui/views/focus/focus_manager_test.h"
#include "ui/views/widget/widget.h"
-#include "views/controls/button/text_button.h"
#if !defined(USE_AURA)
#include "ui/views/controls/tabbed_pane/native_tabbed_pane_wrapper.h"
diff --git a/ui/views/focus/focus_manager_unittest_win.cc b/ui/views/focus/focus_manager_unittest_win.cc
index 4744d8d..6cc4a6b 100644
--- a/ui/views/focus/focus_manager_unittest_win.cc
+++ b/ui/views/focus/focus_manager_unittest_win.cc
@@ -5,10 +5,10 @@
#include "ui/views/focus/focus_manager.h"
#include "base/utf_string_conversions.h"
+#include "ui/views/controls/button/text_button.h"
#include "ui/views/focus/accelerator_handler.h"
#include "ui/views/focus/focus_manager_test.h"
#include "ui/views/widget/widget.h"
-#include "views/controls/button/text_button.h"
namespace views {
diff --git a/ui/views/focus/focus_traversal_unittest.cc b/ui/views/focus/focus_traversal_unittest.cc
index 02151d7..3e9127b 100644
--- a/ui/views/focus/focus_traversal_unittest.cc
+++ b/ui/views/focus/focus_traversal_unittest.cc
@@ -7,15 +7,15 @@
#include "base/string_number_conversions.h"
#include "base/utf_string_conversions.h"
#include "ui/base/models/combobox_model.h"
+#include "ui/views/controls/button/checkbox.h"
+#include "ui/views/controls/button/radio_button.h"
+#include "ui/views/controls/button/text_button.h"
#include "ui/views/controls/combobox/combobox.h"
#include "ui/views/controls/native/native_view_host.h"
#include "ui/views/controls/textfield/textfield.h"
#include "ui/views/focus/focus_manager_test.h"
#include "ui/views/widget/root_view.h"
#include "ui/views/widget/widget.h"
-#include "views/controls/button/checkbox.h"
-#include "views/controls/button/radio_button.h"
-#include "views/controls/button/text_button.h"
#include "views/controls/label.h"
#include "views/controls/link.h"
#include "views/controls/scroll_view.h"