Athena's FocusRules

apps/shell/browser/shell_desktop_controller.cc

 // Copyright 2014 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 "apps/shell/browser/shell_desktop_controller.h"
 
 #include "apps/shell/browser/shell_app_window_controller.h"
 #include "apps/shell/common/switches.h"
 #include "base/command_line.h"
 #include "content/public/browser/context_factory.h"
@@ skipping 243 matching lines @@
   InitWindowManager();
 
   host_->AddObserver(this);
 
   // Ensure the X window gets mapped.
   host_->Show();
 }
 
 void ShellDesktopController::InitWindowManager() {
   wm::FocusController* focus_controller =
-      new wm::FocusController(new AppsFocusRules());
+      new wm::FocusController(CreateFocusRules());
   aura::client::SetFocusClient(host_->window(), focus_controller);
   host_->window()->AddPreTargetHandler(focus_controller);
   aura::client::SetActivationClient(host_->window(), focus_controller);
   focus_client_.reset(focus_controller);
 
   input_method_filter_.reset(
       new wm::InputMethodEventFilter(host_->GetAcceleratedWidget()));
   input_method_filter_->SetInputMethodPropertyInRootWindow(host_->window());
   root_window_event_filter_->AddHandler(input_method_filter_.get());
 
@@ skipping 13 matching lines @@
 
   user_activity_detector_.reset(new wm::UserActivityDetector);
   host_->event_processor()->GetRootTarget()->AddPreTargetHandler(
       user_activity_detector_.get());
 #if defined(OS_CHROMEOS)
   user_activity_notifier_.reset(
       new ui::UserActivityPowerManagerNotifier(user_activity_detector_.get()));
 #endif
 }
 
+wm::FocusRules* ShellDesktopController::CreateFocusRules() {
+  return new AppsFocusRules();
+}
+
 void ShellDesktopController::DestroyRootWindow() {
   host_->RemoveObserver(this);
   if (input_method_filter_)
     root_window_event_filter_->RemoveHandler(input_method_filter_.get());
   if (user_activity_detector_) {
     host_->event_processor()->GetRootTarget()->RemovePreTargetHandler(
         user_activity_detector_.get());
   }
   wm::FocusController* focus_controller =
       static_cast<wm::FocusController*>(focus_client_.get());
@@ skipping 20 matching lines @@
   if (displays.empty())
     return gfx::Size();
   const ui::DisplayMode* mode = displays[0].display->current_mode();
   return mode ? mode->size() : gfx::Size();
 #else
   return gfx::Size();
 #endif
 }
 
 }  // namespace apps