Hook up the FocusController behind a flag.

ash/shell.cc

 // Copyright (c) 2012 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.
 
 #include "ash/shell.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/accelerators/focus_manager_factory.h"
@@ skipping 18 matching lines @@
 #include "ash/shell_window_ids.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/tooltips/tooltip_controller.h"
 #include "ash/touch/touch_observer_hud.h"
 #include "ash/wm/activation_controller.h"
 #include "ash/wm/always_on_top_controller.h"
 #include "ash/wm/app_list_controller.h"
 #include "ash/wm/ash_activation_controller.h"
+#include "ash/wm/ash_focus_rules.h"
 #include "ash/wm/base_layout_manager.h"
 #include "ash/wm/capture_controller.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/custom_frame_view_ash.h"
 #include "ash/wm/dialog_frame_view.h"
 #include "ash/wm/event_client_impl.h"
 #include "ash/wm/event_rewriter_event_filter.h"
 #include "ash/wm/overlay_event_filter.h"
 #include "ash/wm/power_button_controller.h"
 #include "ash/wm/property_util.h"
@@ skipping 27 matching lines @@
 #include "ui/aura/ui_controls_aura.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
 #include "ui/ui_controls/ui_controls.h"
 #include "ui/views/corewm/compound_event_filter.h"
+#include "ui/views/corewm/corewm_switches.h"
+#include "ui/views/corewm/focus_controller.h"
 #include "ui/views/corewm/input_method_event_filter.h"
 #include "ui/views/corewm/shadow_controller.h"
 #include "ui/views/corewm/visibility_controller.h"
 #include "ui/views/corewm/window_modality_controller.h"
 #include "ui/views/focus/focus_manager_factory.h"
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/widget.h"
 
 #if !defined(OS_MACOSX)
 #include "ash/accelerators/accelerator_controller.h"
@@ skipping 70 matching lines @@
   // Overridden from views::corewm::VisibilityController:
   virtual bool CallAnimateOnChildWindowVisibilityChanged(
       aura::Window* window,
       bool visible) OVERRIDE {
     return AnimateOnChildWindowVisibilityChanged(window, visible);
   }
 
   DISALLOW_COPY_AND_ASSIGN(AshVisibilityController);
 };
 
+bool UseFocusController() {
+  return CommandLine::ForCurrentProcess()->HasSwitch(
+      views::corewm::switches::kUseFocusController);
+}
+
 }  // namespace
 
 // static
 Shell* Shell::instance_ = NULL;
 // static
 bool Shell::initially_hide_cursor_ = false;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Shell::TestApi
 
@@ skipping 21 matching lines @@
     Shell::TestApi::screen_position_controller() {
   return shell_->screen_position_controller_.get();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, public:
 
 Shell::Shell(ShellDelegate* delegate)
     : screen_(new ScreenAsh),
       active_root_window_(NULL),
       delegate_(delegate),

[sadrul, 2012/12/03 06:32:17]

Initialize activation_client_ here.

 #if defined(OS_CHROMEOS)
       output_configurator_(new chromeos::OutputConfigurator()),
       output_configurator_animation_(
           new internal::OutputConfiguratorAnimation()),
 #endif  // defined(OS_CHROMEOS)
       browser_context_(NULL),
       simulate_modal_window_open_for_testing_(false) {
   DCHECK(delegate_.get());
   display_manager_.reset(new internal::DisplayManager);
   ANNOTATE_LEAKING_OBJECT_PTR(screen_);  // see crbug.com/156466
@@ skipping 193 matching lines @@
   }
 #endif
 
   // Install the custom factory first so that views::FocusManagers for Tray,
   // Launcher, and WallPaper could be created by the factory.
   views::FocusManagerFactory::Install(new AshFocusManagerFactory);
 
   env_filter_.reset(new views::corewm::CompoundEventFilter);
   AddPreTargetHandler(env_filter_.get());
 
-  focus_client_.reset(new aura::FocusManager);
-  activation_controller_.reset(
-      new internal::ActivationController(
-          focus_client_.get(),
-          new internal::AshActivationController));
-  AddPreTargetHandler(activation_controller_.get());
+  if (UseFocusController()) {
+    views::corewm::FocusController* focus_controller =
+        new views::corewm::FocusController(new wm::AshFocusRules);
+    focus_client_.reset(focus_controller);
+    activation_client_ = focus_controller;
+  } else {
+    focus_client_.reset(new aura::FocusManager);
+    activation_controller_.reset(
+        new internal::ActivationController(
+            focus_client_.get(),
+            new internal::AshActivationController));
+    activation_client_ = activation_controller_.get();
+    AddPreTargetHandler(activation_controller_.get());
+  }
 
   focus_cycler_.reset(new internal::FocusCycler());
 
   screen_position_controller_.reset(new internal::ScreenPositionController);
   display_controller_.reset(new DisplayController);
   display_controller_->InitPrimaryDisplay();
   aura::RootWindow* root_window = display_controller_->GetPrimaryRootWindow();
   active_root_window_ = root_window;
 
   cursor_manager_.SetDeviceScaleFactor(
@@ skipping 66 matching lines @@
   AddPreTargetHandler(window_modality_controller_.get());
 
   magnification_controller_.reset(
       MagnificationController::CreateInstance());
 
   partial_magnification_controller_.reset(
       new PartialMagnificationController());
 
   high_contrast_controller_.reset(new HighContrastController);
   video_detector_.reset(new VideoDetector);
-  window_cycle_controller_.reset(
-      new WindowCycleController(activation_controller_.get()));
+  window_cycle_controller_.reset(new WindowCycleController(activation_client_));
 
   tooltip_controller_.reset(new internal::TooltipController(
       drag_drop_controller_.get()));
   AddPreTargetHandler(tooltip_controller_.get());
 
   event_client_.reset(new internal::EventClientImpl);
 
   InitRootWindowController(root_window_controller);
 
   // This controller needs to be set before SetupManagedWindowMode.
@@ skipping 280 matching lines @@
       DoInitialAnimation();
 }
 
 aura::client::StackingClient* Shell::stacking_client() {
   return stacking_client_.get();
 }
 
 void Shell::InitRootWindowController(
     internal::RootWindowController* controller) {
   aura::RootWindow* root_window = controller->root_window();
-  DCHECK(activation_controller_.get());
+  DCHECK(activation_client_);
   DCHECK(visibility_controller_.get());
   DCHECK(drag_drop_controller_.get());
   DCHECK(capture_controller_.get());
   DCHECK(window_cycle_controller_.get());
 
   aura::client::SetFocusClient(root_window, focus_client_.get());
   input_method_filter_->SetInputMethodPropertyInRootWindow(root_window);
-  aura::client::SetActivationClient(root_window, activation_controller_.get());
+  aura::client::SetActivationClient(root_window, activation_client_);
+  if (UseFocusController()) {
+    views::corewm::FocusController* controller =
+        static_cast<views::corewm::FocusController*>(activation_client_);
+    root_window->AddPreTargetHandler(controller);
+  }
   aura::client::SetVisibilityClient(root_window, visibility_controller_.get());
   aura::client::SetDragDropClient(root_window, drag_drop_controller_.get());
   aura::client::SetCaptureClient(root_window, capture_controller_.get());
   aura::client::SetScreenPositionClient(root_window,
                                         screen_position_controller_.get());
   aura::client::SetCursorClient(root_window, &cursor_manager_);
   aura::client::SetTooltipClient(root_window, tooltip_controller_.get());
   aura::client::SetEventClient(root_window, event_client_.get());
 
   if (nested_dispatcher_controller_.get()) {
@@ skipping 39 matching lines @@
 
 bool Shell::CanAcceptEvents() {
   return true;
 }
 
 ui::EventTarget* Shell::GetParentTarget() {
   return NULL;
 }
 
 }  // namespace ash