athena/content/shell/content_activity_factory.cc - Issue 501093003: Consolidate AppControllDelegate to ExtensionsDelegate

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: athena/content/shell/content_activity_factory.cc

Issue 501093003: Consolidate AppControllDelegate to ExtensionsDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

View side-by-side diff with in-line comments

Download patch

Index: athena/content/shell/content_activity_factory.cc

diff --git a/athena/content/shell/content_activity_factory.cc b/athena/content/shell/content_activity_factory.cc

index c150f327d25fe9f32168b3f35b25678985fba3e6..538ca268b0a85cfe7b091a33a2036a297c3cbdd9 100644

--- a/athena/content/shell/content_activity_factory.cc

+++ b/athena/content/shell/content_activity_factory.cc

@@ -9,8 +9,9 @@

namespace athena {

Activity* ContentActivityFactory::CreateAppActivity(

- extensions::ShellAppWindow* app_window) {

- return new ShellAppActivity(app_window);

+ extensions::ShellAppWindow* app_window,

+ const std::string& app_id) {

+ return new ShellAppActivity(app_window, app_id);

}

Activity* ContentActivityFactory::CreateAppActivity(

« no previous file with comments | « athena/content/public/app_registry.h ('k') | athena/content/shell/shell_app_activity.h » ('j') | no next file with comments »