Separate athena's startup process from AppShell's

extensions/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 "extensions/shell/browser/shell_desktop_controller.h"
 
 #include "base/command_line.h"
-#include "extensions/shell/browser/shell_app_window_controller.h"
+#include "extensions/shell/browser/shell_app_window.h"
 #include "extensions/shell/common/switches.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/cursor/image_cursors.h"
@@ skipping 125 matching lines @@
   virtual ~AppsFocusRules() {}
 
   virtual bool SupportsChildActivation(aura::Window* window) const OVERRIDE {
     return true;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AppsFocusRules);
 };
 
-ShellDesktopController* g_instance = NULL;
-
 }  // namespace
 
 ShellDesktopController::ShellDesktopController() {
-  CHECK(!g_instance) << "ShellDesktopController already exists";
-
 #if defined(OS_CHROMEOS)
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       AddObserver(this);
   display_configurator_.reset(new ui::DisplayConfigurator);
   display_configurator_->Init(false);
   display_configurator_->ForceInitialConfigure(0);
   display_configurator_->AddObserver(this);
 #endif
 
   CreateRootWindow();
-
-  g_instance = this;
 }
 
 ShellDesktopController::~ShellDesktopController() {
-  app_window_controller_.reset();
-  g_instance = NULL;
   DestroyRootWindow();

[James Cook, 2014/08/25 16:56:14]

I think you should either app_window_.reset() before you destroy the root window
or DCHECK(!app_window_.get()) to ensure CloseAppWindows() was called.

[oshima, 2014/08/25 17:29:32]

Done.

 #if defined(OS_CHROMEOS)
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       RemoveObserver(this);
 #endif
 }
 
-// static
-ShellDesktopController* ShellDesktopController::instance() {
-  return g_instance;
-}
-
-void ShellDesktopController::SetAppWindowController(
-    ShellAppWindowController* app_window_controller) {
-  app_window_controller_.reset(app_window_controller);
+aura::WindowTreeHost* ShellDesktopController::GetHost() {
+  return host_.get();
 }
 
 ShellAppWindow* ShellDesktopController::CreateAppWindow(
     content::BrowserContext* context,
     const Extension* extension) {
-  return app_window_controller_->CreateAppWindow(context, extension);
+  aura::Window* root_window = GetHost()->window();
+
+  app_window_.reset(new ShellAppWindow);
+  app_window_->Init(context, extension, root_window->bounds().size());
+
+  // Attach the web contents view to our window hierarchy.
+  aura::Window* content = app_window_->GetNativeWindow();
+  root_window->AddChild(content);
+  content->Show();
+
+  return app_window_.get();
 }
 
 void ShellDesktopController::CloseAppWindows() {
-  if (app_window_controller_)
-    app_window_controller_->CloseAppWindows();
-}
-
-void ShellDesktopController::SetDisplayWorkAreaInsets(
-    const gfx::Insets& insets) {
-  test_screen_->SetWorkAreaInsets(insets);
+  app_window_.reset();
 }
 
 aura::Window* ShellDesktopController::GetDefaultParent(
     aura::Window* context,
     aura::Window* window,
     const gfx::Rect& bounds) {
   return host_->window();
 }
 
 #if defined(OS_CHROMEOS)
@@ skipping 17 matching lines @@
 void ShellDesktopController::OnHostCloseRequested(
     const aura::WindowTreeHost* host) {
   DCHECK_EQ(host_.get(), host);
   CloseAppWindows();
   base::MessageLoop::current()->PostTask(FROM_HERE,
                                          base::MessageLoop::QuitClosure());
 }
 
 void ShellDesktopController::InitWindowManager() {
   wm::FocusController* focus_controller =
-      new wm::FocusController(CreateFocusRules());
+      new wm::FocusController(new AppsFocusRules());
   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::CreateRootWindow() {
   // Set up basic pieces of ui::wm.
   gfx::Size size;
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kAppShellHostWindowBounds)) {
     const std::string size_str =
         command_line->GetSwitchValueASCII(switches::kAppShellHostWindowBounds);
     int width, height;
     CHECK_EQ(2, sscanf(size_str.c_str(), "%dx%d", &width, &height));
     size = gfx::Size(width, height);
@@ skipping 54 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 extensions