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

ui/aura_shell/shell.h

 // 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.
 
 #ifndef UI_AURA_SHELL_SHELL_H_
 #define UI_AURA_SHELL_SHELL_H_
 #pragma once
 
 #include <utility>
 #include <vector>
@@ skipping 14 matching lines @@
 }
 
 namespace aura_shell {
 
 class Launcher;
 class ShellAcceleratorController;
 class ShellDelegate;
 class ShellTooltipManager;
 
 namespace internal {
-class ActivationController;
 class AppList;
 class DragDropController;
 class ShadowController;
 class ShellAcceleratorFilter;
 class WorkspaceController;
 }
 
 // Shell is a singleton object that presents the Shell API and implements the
 // RootWindow's delegate interface.
 class AURA_SHELL_EXPORT Shell {
@@ skipping 57 matching lines @@
   base::WeakPtrFactory<Shell> method_factory_;
 
   scoped_ptr<ShellAcceleratorController> accelerator_controller_;
 
   scoped_ptr<ShellDelegate> delegate_;
 
   scoped_ptr<Launcher> launcher_;
 
   scoped_ptr<internal::AppList> app_list_;
 
-  scoped_ptr<internal::ActivationController> activation_controller_;
   scoped_ptr<internal::DragDropController> drag_drop_controller_;
   scoped_ptr<internal::WorkspaceController> workspace_controller_;
   scoped_ptr<internal::ShadowController> shadow_controller_;
 
   // An event filter that pre-handles global accelerators.
   scoped_ptr<internal::ShellAcceleratorFilter> accelerator_filter_;
 
   scoped_ptr<ShellTooltipManager> tooltip_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace aura_shell
 
 #endif  // UI_AURA_SHELL_SHELL_H_