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

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

Issue 642383003: Add the ability to load multiple apps into app_shell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « extensions/shell/browser/desktop_controller.h ('k') | extensions/shell/browser/shell_desktop_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/shell/browser/shell_desktop_controller.h
diff --git a/extensions/shell/browser/shell_desktop_controller.h b/extensions/shell/browser/shell_desktop_controller.h
index 14aa4667c5e386f28adc8f9e4660c66582a14cbc..0b75e6b4b5b81becd0af614d0bdc20cb78a6a212 100644
--- a/extensions/shell/browser/shell_desktop_controller.h
+++ b/extensions/shell/browser/shell_desktop_controller.h
@@ -5,6 +5,8 @@
#ifndef EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_
#define EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_
+#include <vector>
+
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
@@ -69,6 +71,7 @@ class ShellDesktopController : public DesktopController,
virtual AppWindow* CreateAppWindow(content::BrowserContext* context,
const Extension* extension) override;
virtual void AddAppWindow(aura::Window* window) override;
+ virtual void RemoveAppWindow(AppWindow* window) override;
virtual void CloseAppWindows() override;
// aura::client::WindowTreeClient overrides:
@@ -131,8 +134,8 @@ class ShellDesktopController : public DesktopController,
scoped_ptr<AppWindowClient> app_window_client_;
- // The desktop supports a single app window.
- AppWindow* app_window_; // NativeAppWindow::Close() deletes this.
+ // NativeAppWindow::Close() deletes the AppWindow.
+ std::vector<AppWindow*> app_windows_;
DISALLOW_COPY_AND_ASSIGN(ShellDesktopController);
};
« no previous file with comments | « extensions/shell/browser/desktop_controller.h ('k') | extensions/shell/browser/shell_desktop_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698