apps/shell/browser/default_shell_browser_main_delegate.cc - Issue 335003003: Introduces AppActivity and handler of chrome.shell API.

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: apps/shell/browser/default_shell_browser_main_delegate.cc

Issue 335003003: Introduces AppActivity and handler of chrome.shell API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: AppWindow ownership 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:

Index: apps/shell/browser/default_shell_browser_main_delegate.cc

diff --git a/apps/shell/browser/default_shell_browser_main_delegate.cc b/apps/shell/browser/default_shell_browser_main_delegate.cc

index b9a8baffe1e33fd2d5680bff211fa5b55b38af24..977c07eed4ee8fc9df3807792838e6bf214eb80c 100644

--- a/apps/shell/browser/default_shell_browser_main_delegate.cc

+++ b/apps/shell/browser/default_shell_browser_main_delegate.cc

@@ -4,6 +4,7 @@

#include "apps/shell/browser/default_shell_browser_main_delegate.h"

+#include "apps/shell/browser/default_shell_app_window_controller.h"

#include "apps/shell/browser/shell_desktop_controller.h"

#include "apps/shell/browser/shell_extension_system.h"

#include "base/command_line.h"

@@ -42,7 +43,9 @@ void DefaultShellBrowserMainDelegate::Shutdown() {

ShellDesktopController*

DefaultShellBrowserMainDelegate::CreateDesktopController() {

- return new ShellDesktopController();

+ ShellDesktopController* desktop = new ShellDesktopController();

+ desktop->SetAppWindowController(new DefaultShellAppWindowController(desktop));

+ return desktop;

}

} // namespace apps