Athena's FocusRules

athena/main/athena_main.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/app/shell_main_delegate.h"
 #include "apps/shell/browser/shell_browser_main_delegate.h"
 #include "apps/shell/browser/shell_content_browser_client.h"
 #include "apps/shell/browser/shell_desktop_controller.h"
 #include "apps/shell/browser/shell_extension_system.h"
 #include "apps/shell/common/switches.h"
 #include "apps/shell/renderer/shell_renderer_main_delegate.h"
 #include "athena/content/public/content_activity_factory.h"
 #include "athena/content/public/content_app_model_builder.h"
 #include "athena/home/public/home_card.h"
 #include "athena/main/athena_app_window_controller.h"
 #include "athena/main/athena_launcher.h"
 #include "athena/main/debug/debug_window.h"
 #include "athena/main/placeholder.h"
 #include "athena/main/url_search_provider.h"
+#include "athena/screen/public/screen_manager.h"
 #include "athena/virtual_keyboard/public/virtual_keyboard_bindings.h"
 #include "athena/virtual_keyboard/public/virtual_keyboard_manager.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "content/public/app/content_main.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_controller_observer.h"
@@ skipping 21 matching lines @@
   }
 
  private:
   virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) OVERRIDE {
     athena::HomeCard::Get()->UpdateVirtualKeyboardBounds(new_bounds);
   }
 
   DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardObserver);
 };
 
+class AthenaDesktopController : public apps::ShellDesktopController {
+ public:
+  AthenaDesktopController() {}
+  virtual ~AthenaDesktopController() {}
+
+ private:
+  // apps::ShellDesktopController:
+  virtual wm::FocusRules* CreateFocusRules() OVERRIDE {
+    return athena::ScreenManager::CreateFocusRules();
+  }
+  DISALLOW_COPY_AND_ASSIGN(AthenaDesktopController);

[James Cook, 2014/07/18 02:39:51]

nit: blank line above

[oshima, 2014/07/18 04:03:52]

Done.

+};
+
 class AthenaBrowserMainDelegate : public apps::ShellBrowserMainDelegate {
  public:
   AthenaBrowserMainDelegate() {}
   virtual ~AthenaBrowserMainDelegate() {}
 
   // apps::ShellBrowserMainDelegate:
   virtual void Start(content::BrowserContext* context) OVERRIDE {
     base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
     base::FilePath app_dir = base::FilePath::FromUTF8Unsafe(
         command_line->HasSwitch(apps::switches::kAppShellAppPath) ?
@@ skipping 22 matching lines @@
   }
 
   virtual void Shutdown() OVERRIDE {
     keyboard_observer_.reset();
     athena::ShutdownAthena();
   }
 
   virtual apps::ShellDesktopController* CreateDesktopController() OVERRIDE {
     // TODO(mukai): create Athena's own ShellDesktopController subclass so that
     // it can initialize its own window manager logic.
-    apps::ShellDesktopController* desktop = new apps::ShellDesktopController();
+    apps::ShellDesktopController* desktop = new AthenaDesktopController();
     desktop->SetAppWindowController(new athena::AthenaAppWindowController());
     return desktop;
   }
 
  private:
   scoped_ptr<VirtualKeyboardObserver> keyboard_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(AthenaBrowserMainDelegate);
 };
 
@@ skipping 61 matching lines @@
 
 int main(int argc, const char** argv) {
   AthenaMainDelegate delegate;
   content::ContentMainParams params(&delegate);
 
   params.argc = argc;
   params.argv = argv;
 
   return content::ContentMain(params);
 }