Introduces AppActivity and handler of chrome.shell API.

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.h"
+#include "apps/shell/browser/shell_app_window_controller.h"
 #include "content/public/browser/context_factory.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/env.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"
@@ skipping 148 matching lines @@
   display_configurator_->ForceInitialConfigure(0);
   display_configurator_->AddObserver(this);
 #endif
   aura::Env::CreateInstance(true);
   aura::Env::GetInstance()->set_context_factory(content::GetContextFactory());
 
   g_instance = this;
 }
 
 ShellDesktopController::~ShellDesktopController() {
-  // The app window must be explicitly closed before desktop teardown.
-  DCHECK(!app_window_);
+  app_window_controller_.reset();
   g_instance = NULL;
   DestroyRootWindow();
   aura::Env::DeleteInstance();
 }
 
 // static
 ShellDesktopController* ShellDesktopController::instance() {
   return g_instance;
 }
 
+void ShellDesktopController::SetAppWindowController(
+    ShellAppWindowController* app_window_controller) {
+  app_window_controller_.reset(app_window_controller);
+}
+
 ShellAppWindow* ShellDesktopController::CreateAppWindow(
     content::BrowserContext* context) {
-  aura::Window* root_window = host_->window();
-
-  app_window_.reset(new ShellAppWindow);
-  app_window_->Init(context, 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();
+  return app_window_controller_

[oshima, 2014/06/16 18:40:08]

then you can remove NULL check?

[Jun Mukai, 2014/06/16 18:48:15]

Removed, anyways app_window_controller_ needs to be specified beforehand.

+             ? app_window_controller_->CreateAppWindow(context)
+             : NULL;
 }
 
-void ShellDesktopController::CloseAppWindow() { app_window_.reset(); }
+void ShellDesktopController::CloseAppWindows() {
+  if (app_window_controller_)
+    app_window_controller_->CloseAppWindows();
+}
 
 aura::Window* ShellDesktopController::GetDefaultParent(
     aura::Window* context,
     aura::Window* window,
     const gfx::Rect& bounds) {
   return host_->window();
 }
 
 #if defined(OS_CHROMEOS)
 void ShellDesktopController::OnDisplayModeChanged(
     const std::vector<ui::DisplayConfigurator::DisplayState>& displays) {
   gfx::Size size = GetPrimaryDisplaySize();
   if (!size.IsEmpty())
     host_->UpdateRootWindowSize(size);
 }
 #endif
 
 void ShellDesktopController::OnHostCloseRequested(
     const aura::WindowTreeHost* host) {
   DCHECK_EQ(host_.get(), host);
-  CloseAppWindow();
+  CloseAppWindows();
   base::MessageLoop::current()->PostTask(FROM_HERE,
                                          base::MessageLoop::QuitClosure());
 }
 
 void ShellDesktopController::CreateRootWindow() {
   test_screen_.reset(aura::TestScreen::Create());
   // TODO(jamescook): Replace this with a real Screen implementation.
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get());
   // TODO(mukai): Set up input method.
 
@@ skipping 84 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