athena/activity/public/activity_factory.h - 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/activity/public/activity_factory.h

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/activity/public/activity_factory.h

diff --git a/athena/activity/public/activity_factory.h b/athena/activity/public/activity_factory.h

index d9ec79a1760754e36c7e62e71475f006400db59d..557f3b173904e5c1750e476fcadb0ec4de49c07a 100644

--- a/athena/activity/public/activity_factory.h

+++ b/athena/activity/public/activity_factory.h

@@ -44,8 +44,8 @@ class ATHENA_EXPORT ActivityFactory {

// The returned activity should own |app_window|.

// TODO(oshima): Consolidate these two methods to create AppActivity

// once crbug.com/403726 is finished.

- virtual Activity* CreateAppActivity(

- extensions::ShellAppWindow* app_window) = 0;

+ virtual Activity* CreateAppActivity(extensions::ShellAppWindow* app_window,

+ const std::string& id) = 0;

// Create an activity of an app with |app_window| for chrome environment.

virtual Activity* CreateAppActivity(apps::AppWindow* app_window) = 0;

« no previous file with comments | « no previous file | athena/athena.gyp » ('j') | no next file with comments »