summaryrefslogtreecommitdiffstats
path: root/ui/aura_shell
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-10 20:42:59 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-10 20:42:59 +0000
commit9c19439858bb0c4f050187f093631ea01176da46 (patch)
treeccb066ad00b4c59483d2e17825197e9e76eb8b11 /ui/aura_shell
parent41bd81eb9e7a4f76e59221ab1cdd302feebccde1 (diff)
downloadchromium_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 'ui/aura_shell')
-rw-r--r--ui/aura_shell/aura_shell.gyp2
-rw-r--r--ui/aura_shell/examples/aura_shell_main.cc (renamed from ui/aura_shell/aura_shell_main.cc)0
2 files changed, 1 insertions, 1 deletions
diff --git a/ui/aura_shell/aura_shell.gyp b/ui/aura_shell/aura_shell.gyp
index 6ad6874..81f4cf7 100644
--- a/ui/aura_shell/aura_shell.gyp
+++ b/ui/aura_shell/aura_shell.gyp
@@ -97,7 +97,7 @@
'aura_shell',
],
'sources': [
- 'aura_shell_main.cc',
+ 'examples/aura_shell_main.cc',
'examples/bubble.cc',
'examples/example_factory.h',
'examples/lock_view.cc',
diff --git a/ui/aura_shell/aura_shell_main.cc b/ui/aura_shell/examples/aura_shell_main.cc
index b556ffa..b556ffa 100644
--- a/ui/aura_shell/aura_shell_main.cc
+++ b/ui/aura_shell/examples/aura_shell_main.cc