Remove old activation code and disable-focus-controller flags

ash/shell.h

Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 718d1f839d3396ec08c96e42418b8b702ad041f1..c4762ab73d5f64432df7108fc952566f6bc0659d 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -100,7 +100,6 @@ class WindowSelectorController;
 
 namespace internal {
 class AcceleratorFilter;
-class ActivationController;
 class AppListController;
 class AppListLauncherItemDelegate;
 class CaptureController;
@@ -555,7 +554,6 @@ class ASH_EXPORT Shell
 
   scoped_ptr<internal::AppListController> app_list_controller_;
 
-  scoped_ptr<internal::ActivationController> activation_controller_;
   scoped_ptr<internal::DragDropController> drag_drop_controller_;
   scoped_ptr<internal::ResizeShadowController> resize_shadow_controller_;
   scoped_ptr<views::corewm::ShadowController> shadow_controller_;