Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Unified Diff: apps/shell/browser/shell_desktop_controller.h

Issue 335003003: Introduces AppActivity and handler of chrome.shell API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « apps/shell/browser/shell_app_window_controller.h ('k') | apps/shell/browser/shell_desktop_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/shell/browser/shell_desktop_controller.h
diff --git a/apps/shell/browser/shell_desktop_controller.h b/apps/shell/browser/shell_desktop_controller.h
index 2c5b84636728b1ffeff9a7da9488922d44814fc4..884b18ccc6d5e0394c1751b20c714e58495085e9 100644
--- a/apps/shell/browser/shell_desktop_controller.h
+++ b/apps/shell/browser/shell_desktop_controller.h
@@ -49,6 +49,7 @@ class UserActivityDetector;
namespace apps {
class ShellAppWindow;
+class ShellAppWindowController;
// Handles desktop-related tasks for app_shell.
class ShellDesktopController : public aura::client::WindowTreeClient,
@@ -72,12 +73,14 @@ class ShellDesktopController : public aura::client::WindowTreeClient,
// Creates the window that hosts the app.
void CreateRootWindow();
+ void SetAppWindowController(ShellAppWindowController* app_window_controller);
James Cook 2014/06/16 20:20:32 nit: Comment that it takes ownership.
Jun Mukai 2014/06/16 20:44:20 Done.
+
// 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,
@@ -130,7 +133,7 @@ class ShellDesktopController : public aura::client::WindowTreeClient,
#endif
// The desktop supports a single app window.
- scoped_ptr<ShellAppWindow> app_window_;
+ scoped_ptr<ShellAppWindowController> app_window_controller_;
DISALLOW_COPY_AND_ASSIGN(ShellDesktopController);
};
« no previous file with comments | « apps/shell/browser/shell_app_window_controller.h ('k') | apps/shell/browser/shell_desktop_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698