athena/test/sample_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/test/sample_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/test/sample_activity_factory.cc

diff --git a/athena/test/sample_activity_factory.cc b/athena/test/sample_activity_factory.cc

index 71ffef56d5d0610d681365257a31ef1d2039db73..b043e17b2f26fcdf9b9038a68cbf8176b85f48ba 100644

--- a/athena/test/sample_activity_factory.cc

+++ b/athena/test/sample_activity_factory.cc

@@ -35,7 +35,8 @@ Activity* SampleActivityFactory::CreateWebActivity(

}

Activity* SampleActivityFactory::CreateAppActivity(

- extensions::ShellAppWindow* app_window) {

+ extensions::ShellAppWindow* app_window,

+ const std::string& app_id) {

// SampleActivityFactory can't own the |app_window|, so it must be NULL.

DCHECK(app_window == NULL);

return new SampleActivity(

« no previous file with comments | « athena/test/sample_activity_factory.h ('k') | no next file » | no next file with comments »