Athena's FocusRules

apps/shell/browser/shell_desktop_controller.cc

Index: apps/shell/browser/shell_desktop_controller.cc
diff --git a/apps/shell/browser/shell_desktop_controller.cc b/apps/shell/browser/shell_desktop_controller.cc
index e9d11ab9202c1b1e8ddb57ea16e190e5e6e2dcd6..88f114a5500e449b1d0fb73b93b0850ec6d4b437 100644
--- a/apps/shell/browser/shell_desktop_controller.cc
+++ b/apps/shell/browser/shell_desktop_controller.cc
@@ -261,7 +261,7 @@ void ShellDesktopController::CreateRootWindow() {
 
 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);
@@ -295,6 +295,10 @@ void ShellDesktopController::InitWindowManager() {
 #endif
 }
 
+wm::FocusRules* ShellDesktopController::CreateFocusRules() {
+  return new AppsFocusRules();
+}
+
 void ShellDesktopController::DestroyRootWindow() {
   host_->RemoveObserver(this);
   if (input_method_filter_)