Introduces AppActivity and handler of chrome.shell API.

apps/shell/browser/shell_desktop_controller.h

 // 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.
 
 #ifndef APPS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_
 #define APPS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 31 matching lines @@
 namespace wm {
 class CompoundEventFilter;
 class CursorManager;
 class InputMethodEventFilter;
 class UserActivityDetector;
 }
 
 namespace apps {
 
 class ShellAppWindow;
+class ShellAppWindowController;
 
 // Handles desktop-related tasks for app_shell.
 class ShellDesktopController : public aura::client::WindowTreeClient,
                                public aura::WindowTreeHostObserver
 #if defined(OS_CHROMEOS)
                                ,
                                public ui::DisplayConfigurator::Observer
 #endif
                                {
  public:
   ShellDesktopController();
   virtual ~ShellDesktopController();
 
   // Returns the single instance of the desktop. (Stateless functions like
   // ShellAppWindowCreateFunction need to be able to access the desktop, so
   // we need a singleton somewhere).
   static ShellDesktopController* instance();
 
   aura::WindowTreeHost* host() { return host_.get(); }
 
   // Creates the window that hosts the app.
   void CreateRootWindow();
 
+  void SetAppWindowController(ShellAppWindowController* app_window_controller);

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

looks like you can just pass it in ctor?

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

The DefaultShellAppWindowController (of app_shell) requires
ShellDesktopController's reference -- actually it needs the pointer to the root
window to create the actual window correctly (on the other hand, this is not
required at all in Athena).

After considering about this, I think it is better to create
ShellAppWindowController properly *after* ShellDesktopController is created, and
then set it. See app_shell's default_shell_browser_main_delegate.cc FYI.

[oshima, 2014/06/16 18:53:16]

I think this part needs ovehaul later on, so I'm fine if this is necessary for
now.

+
   // Creates a new app window and adds it to the desktop. The desktop maintains
   // ownership of the window.
   ShellAppWindow* CreateAppWindow(content::BrowserContext* context);
 
-  // Closes and destroys the app window.
-  void CloseAppWindow();
+  // Closes and destroys the app windows.
+  void CloseAppWindows();
 
   // Overridden from aura::client::WindowTreeClient:
   virtual aura::Window* GetDefaultParent(aura::Window* context,
                                          aura::Window* window,
                                          const gfx::Rect& bounds) OVERRIDE;
 
 #if defined(OS_CHROMEOS)
   // ui::DisplayConfigurator::Observer overrides.
   virtual void OnDisplayModeChanged(const std::vector<
       ui::DisplayConfigurator::DisplayState>& displays) OVERRIDE;
@@ skipping 32 matching lines @@
   scoped_ptr<aura::client::FocusClient> focus_client_;
 
   scoped_ptr<wm::CursorManager> cursor_manager_;
 
   scoped_ptr<wm::UserActivityDetector> user_activity_detector_;
 #if defined(OS_CHROMEOS)
   scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_;
 #endif
 
   // The desktop supports a single app window.
-  scoped_ptr<ShellAppWindow> app_window_;
+  scoped_ptr<ShellAppWindowController> app_window_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellDesktopController);
 };
 
 }  // namespace apps
 
 #endif  // APPS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_