extensions/shell/browser/shell_desktop_controller.h - Issue 642383003: Add the ability to load multiple apps into app_shell.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

« extensions/shell/browser/desktop_controller.h ('K') | « extensions/shell/browser/desktop_controller.h ('k') | extensions/shell/browser/shell_desktop_controller.cc » ('j') | extensions/shell/browser/shell_desktop_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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..80c9f237e9b14c7f1a8047a444d8628d6ff0fc44 100644

--- a/extensions/shell/browser/shell_desktop_controller.h

+++ b/extensions/shell/browser/shell_desktop_controller.h

@@ -69,6 +69,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 +132,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);

};