summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-08 00:34:05 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-08 00:34:05 +0000
commit2362e4fe2905ab75d3230ebc3e307ae53e2b8362 (patch)
treee6d88357a2021811e0e354f618247217be8bb3da /chrome/test
parentdb23ac3e713dc17509b2b15d3ee634968da45715 (diff)
downloadchromium_src-2362e4fe2905ab75d3230ebc3e307ae53e2b8362.zip
chromium_src-2362e4fe2905ab75d3230ebc3e307ae53e2b8362.tar.gz
chromium_src-2362e4fe2905ab75d3230ebc3e307ae53e2b8362.tar.bz2
Move src/chrome/views to src/views. RS=darin http://crbug.com/11387
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15604 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/automated_ui_tests/automated_ui_tests.cc2
-rw-r--r--chrome/test/automation/automation_proxy.cc3
-rw-r--r--chrome/test/automation/automation_proxy_uitest.cc2
-rw-r--r--chrome/test/interactive_ui/view_event_test_base.cc4
-rw-r--r--chrome/test/interactive_ui/view_event_test_base.h2
-rw-r--r--chrome/test/ui_test_utils.cc2
-rw-r--r--chrome/test/unit/unittests.vcproj12
7 files changed, 13 insertions, 14 deletions
diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.cc b/chrome/test/automated_ui_tests/automated_ui_tests.cc
index bd66201..098ddd7 100644
--- a/chrome/test/automated_ui_tests/automated_ui_tests.cc
+++ b/chrome/test/automated_ui_tests/automated_ui_tests.cc
@@ -25,8 +25,8 @@
#include "chrome/test/automation/tab_proxy.h"
#include "chrome/test/automation/window_proxy.h"
#include "chrome/test/ui/ui_test.h"
-#include "chrome/views/view.h"
#include "googleurl/src/gurl.h"
+#include "views/view.h"
namespace {
diff --git a/chrome/test/automation/automation_proxy.cc b/chrome/test/automation/automation_proxy.cc
index 5489745..f005b92 100644
--- a/chrome/test/automation/automation_proxy.cc
+++ b/chrome/test/automation/automation_proxy.cc
@@ -18,10 +18,9 @@
#include "chrome/test/automation/browser_proxy.h"
#include "chrome/test/automation/tab_proxy.h"
#include "chrome/test/automation/window_proxy.h"
-
#if defined(OS_WIN)
// TODO(port): Enable when dialog_delegate is ported.
-#include "chrome/views/window/dialog_delegate.h"
+#include "views/window/dialog_delegate.h"
#endif
using base::TimeDelta;
diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc
index b782a6c..f997166 100644
--- a/chrome/test/automation/automation_proxy_uitest.cc
+++ b/chrome/test/automation/automation_proxy_uitest.cc
@@ -19,8 +19,8 @@
#include "chrome/test/automation/tab_proxy.h"
#include "chrome/test/automation/window_proxy.h"
#include "chrome/test/ui/ui_test.h"
-#include "chrome/views/event.h"
#include "net/base/net_util.h"
+#include "views/event.h"
class AutomationProxyTest : public UITest {
protected:
diff --git a/chrome/test/interactive_ui/view_event_test_base.cc b/chrome/test/interactive_ui/view_event_test_base.cc
index 0af65ef..785688e 100644
--- a/chrome/test/interactive_ui/view_event_test_base.cc
+++ b/chrome/test/interactive_ui/view_event_test_base.cc
@@ -6,8 +6,8 @@
#include "base/message_loop.h"
#include "chrome/browser/automation/ui_controls.h"
-#include "chrome/views/view.h"
-#include "chrome/views/window/window.h"
+#include "views/view.h"
+#include "views/window/window.h"
namespace {
diff --git a/chrome/test/interactive_ui/view_event_test_base.h b/chrome/test/interactive_ui/view_event_test_base.h
index fa01e81..1bb7bd0 100644
--- a/chrome/test/interactive_ui/view_event_test_base.h
+++ b/chrome/test/interactive_ui/view_event_test_base.h
@@ -7,8 +7,8 @@
#include "base/message_loop.h"
#include "base/thread.h"
-#include "chrome/views/window/window_delegate.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "views/window/window_delegate.h"
class Task;
diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc
index 6d9094b..2e92105 100644
--- a/chrome/test/ui_test_utils.cc
+++ b/chrome/test/ui_test_utils.cc
@@ -12,8 +12,8 @@
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/common/notification_registrar.h"
#include "chrome/common/notification_service.h"
-#include "chrome/views/widget/accelerator_handler.h"
#include "googleurl/src/gurl.h"
+#include "views/widget/accelerator_handler.h"
namespace ui_test_utils {
diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj
index a27f4b8..9ea93b5 100644
--- a/chrome/test/unit/unittests.vcproj
+++ b/chrome/test/unit/unittests.vcproj
@@ -1044,27 +1044,27 @@
Name="views"
>
<File
- RelativePath="..\..\views\focus\focus_manager_unittest.cc"
+ RelativePath="..\..\..\views\focus\focus_manager_unittest.cc"
>
</File>
<File
- RelativePath="..\..\views\grid_layout_unittest.cc"
+ RelativePath="..\..\..\views\grid_layout_unittest.cc"
>
</File>
<File
- RelativePath="..\..\views\controls\label_unittest.cc"
+ RelativePath="..\..\..\views\controls\label_unittest.cc"
>
</File>
<File
- RelativePath="..\..\views\controls\table\table_view_unittest.cc"
+ RelativePath="..\..\..\views\controls\table\table_view_unittest.cc"
>
</File>
<File
- RelativePath="..\..\views\controls\tree\tree_node_iterator_unittest.cc"
+ RelativePath="..\..\..\views\controls\tree\tree_node_iterator_unittest.cc"
>
</File>
<File
- RelativePath="..\..\views\view_unittest.cc"
+ RelativePath="..\..\..\views\view_unittest.cc"
>
</File>
</Filter>