diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-10 20:42:59 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-10 20:42:59 +0000 |
| commit | 9c19439858bb0c4f050187f093631ea01176da46 (patch) | |
| tree | ccb066ad00b4c59483d2e17825197e9e76eb8b11 /views | |
| parent | 41bd81eb9e7a4f76e59221ab1cdd302feebccde1 (diff) | |
| download | chromium_src-9c19439858bb0c4f050187f093631ea01176da46.zip chromium_src-9c19439858bb0c4f050187f093631ea01176da46.tar.gz chromium_src-9c19439858bb0c4f050187f093631ea01176da46.tar.bz2 | |
Move some code around...
test infrastructure -> aura/test
aura_shell_main -> aura/examples
BUG=none
TEST=none
TBR=sky
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=104755
Review URL: http://codereview.chromium.org/8223006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104777 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/test/views_test_base.cc | 4 | ||||
| -rw-r--r-- | views/views.gyp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/views/test/views_test_base.cc b/views/test/views_test_base.cc index bf18dff..264a58a 100644 --- a/views/test/views_test_base.cc +++ b/views/test/views_test_base.cc @@ -13,7 +13,7 @@ #if defined(USE_AURA) #include "ui/aura/desktop.h" -#include "ui/aura/test_desktop_delegate.h" +#include "ui/aura/test/test_desktop_delegate.h" #endif namespace views { @@ -30,7 +30,7 @@ ViewsTestBase::ViewsTestBase() #endif #if defined(USE_AURA) aura::Desktop::set_compositor_factory_for_testing(&TestCreateCompositor); - new aura::TestDesktopDelegate; + new aura::test::TestDesktopDelegate; #else Widget::set_compositor_factory_for_testing(&TestCreateCompositor); #endif diff --git a/views/views.gyp b/views/views.gyp index d71f21e..ae8ba46 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -602,8 +602,8 @@ '../ui/gfx/compositor/test_compositor.h', '../ui/gfx/compositor/test_texture.cc', '../ui/gfx/compositor/test_texture.h', - '../ui/aura/test_desktop_delegate.cc', - '../ui/aura/test_desktop_delegate.h', + '../ui/aura/test/test_desktop_delegate.cc', + '../ui/aura/test/test_desktop_delegate.h', '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', @@ -660,8 +660,8 @@ ], }, { 'sources/': [ - ['exclude', '../ui/aura/test_desktop_delegate.cc'], - ['exclude', '../ui/aura/test_desktop_delegate.h'], + ['exclude', '../ui/aura/test/test_desktop_delegate.cc'], + ['exclude', '../ui/aura/test/test_desktop_delegate.h'], ], }], ['OS!="mac"', { |