extensions/shell/browser/api/shell/shell_api.cc - Issue 480353006: Separate athena's startup process from AppShell's

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/api/shell/shell_api.cc

Issue 480353006: Separate athena's startup process from AppShell's (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: reformat Created 6 years, 4 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: extensions/shell/browser/api/shell/shell_api.cc

diff --git a/extensions/shell/browser/api/shell/shell_api.cc b/extensions/shell/browser/api/shell/shell_api.cc

index afc58ddd1ebb3612378ac9fec6e874b1bcbcd296..3513970587de3d5f2aa32005c3cdd667a6dfbe44 100644

--- a/extensions/shell/browser/api/shell/shell_api.cc

+++ b/extensions/shell/browser/api/shell/shell_api.cc

@@ -48,9 +48,8 @@ ExtensionFunction::ResponseAction ShellCreateWindowFunction::Run() {

return RespondNow(Error(kInvalidArguments));

// The desktop keeps ownership of the window.

- ShellAppWindow* app_window =

- ShellDesktopController::instance()->CreateAppWindow(browser_context(),

- extension());

+ ShellAppWindow* app_window = DesktopController::instance()->CreateAppWindow(

+ browser_context(), extension());

app_window->LoadURL(url);

// Create the reply to send to the renderer.