summaryrefslogtreecommitdiffstats
path: root/ui/aura_shell/aura_shell.gyp
diff options
context:
space:
mode:
Diffstat (limited to 'ui/aura_shell/aura_shell.gyp')
-rw-r--r--ui/aura_shell/aura_shell.gyp22
1 files changed, 11 insertions, 11 deletions
diff --git a/ui/aura_shell/aura_shell.gyp b/ui/aura_shell/aura_shell.gyp
index 2b821e6..163928f 100644
--- a/ui/aura_shell/aura_shell.gyp
+++ b/ui/aura_shell/aura_shell.gyp
@@ -33,13 +33,13 @@
],
'sources': [
# All .cc, .h under views, except unittests
- 'aura_shell_switches.cc',
- 'aura_shell_switches.h',
- 'shell.cc',
- 'shell.h',
- 'shell_delegate.h',
- 'shell_factory.h',
- 'shell_window_ids.h',
+ '../../ash/ash_switches.cc',
+ '../../ash/ash_switches.h',
+ '../../ash/shell.cc',
+ '../../ash/shell.h',
+ '../../ash/shell_delegate.h',
+ '../../ash/shell_factory.h',
+ '../../ash/shell_window_ids.h',
'../../ash/accelerators/accelerator_controller.cc',
'../../ash/accelerators/accelerator_controller.h',
'../../ash/accelerators/accelerator_filter.cc',
@@ -174,22 +174,22 @@
'aura_shell',
],
'sources': [
- 'run_all_unittests.cc',
- 'shell_unittest.cc',
'../../ash/accelerators/accelerator_controller_unittest.cc',
'../../ash/drag_drop/drag_drop_controller_unittest.cc',
'../../ash/launcher/launcher_model_unittest.cc',
'../../ash/launcher/launcher_unittest.cc',
'../../ash/launcher/view_model_unittest.cc',
'../../ash/launcher/view_model_utils_unittest.cc',
- '../../ash/test/test_suite.cc',
- '../../ash/test/test_suite.h',
+ '../../ash/shell_unittest.cc',
+ '../../ash/test/ash_unittests.cc',
'../../ash/test/aura_shell_test_base.cc',
'../../ash/test/aura_shell_test_base.h',
'../../ash/test/test_activation_delegate.cc',
'../../ash/test/test_activation_delegate.h',
'../../ash/test/test_shell_delegate.cc',
'../../ash/test/test_shell_delegate.h',
+ '../../ash/test/test_suite.cc',
+ '../../ash/test/test_suite.h',
'../../ash/tooltips/tooltip_controller_unittest.cc',
'../../ash/wm/activation_controller_unittest.cc',
'../../ash/wm/default_container_layout_manager_unittest.cc',