Revert 114095 - Move the concept of Activation to the Shell.

ui/aura_shell/aura_shell.gyp

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
 
   'targets': [
@@ skipping 15 matching lines @@
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
         '../ui.gyp:ui_resources_standard',
         '../views/views.gyp:views',
       ],
       'defines': [
         'AURA_SHELL_IMPLEMENTATION',
       ],
       'sources': [
         # All .cc, .h under views, except unittests
-        'activation_controller.cc',
-        'activation_controller.h',
         'always_on_top_controller.cc',
         'always_on_top_controller.h',
         'app_list.cc',
         'app_list.h',
         'default_container_event_filter.cc',
         'default_container_event_filter.h',
         'default_container_layout_manager.cc',
         'default_container_layout_manager.h',
         'desktop_background_view.cc',
         'desktop_background_view.h',
@@ skipping 90 matching lines @@
         '../aura/aura.gyp:test_support_aura',
         '../gfx/compositor/compositor.gyp:compositor_test_support',
         '../ui.gyp:gfx_resources',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
         '../ui.gyp:ui_resources_standard',
         '../views/views.gyp:views',
         'aura_shell',
       ],
       'sources': [
-        'activation_controller_unittest.cc',
         'default_container_layout_manager_unittest.cc',
         'root_window_event_filter_unittest.cc',
         'drag_drop_controller_unittest.cc',
         'image_grid_unittest.cc',
         'launcher/launcher_model_unittest.cc',
         'launcher/view_model_unittest.cc',
         'launcher/view_model_utils_unittest.cc',
         'modal_container_layout_manager_unittest.cc',
         'run_all_unittests.cc',
         'shadow_controller_unittest.cc',
         'shell_accelerator_controller_unittest.cc',
         'shell_unittest.cc',
+        'stacking_controller_unittest.cc',
         'test_suite.cc',
         'test_suite.h',
         'test/aura_shell_test_base.cc',
         'test/aura_shell_test_base.h',
-        'test/test_activation_delegate.cc',
-        'test/test_activation_delegate.h',
         'toplevel_layout_manager_unittest.cc',
         'toplevel_window_event_filter_unittest.cc',
         'workspace_controller_unittest.cc',
         'workspace/workspace_manager_unittest.cc',
 
         '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
       ],
       'conditions': [
@@ skipping 39 matching lines @@
         'examples/widgets.cc',
         'examples/window_type_launcher.cc',
         'examples/window_type_launcher.h',
         '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
       ],
     },
   ],
 }