athena/test/sample_activity_factory.cc - Issue 412713002: Move apps/shell to extensions/shell.

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 412713002: Move apps/shell to extensions/shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 40% Created 6 years, 5 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: athena/test/sample_activity_factory.cc

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

index cdd059d88e4504403984871336eb62a39c37a5d3..429342a4be98b40e1c2c41d70633becbef3803d4 100644

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

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

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

}

Activity* SampleActivityFactory::CreateAppActivity(

- apps::ShellAppWindow* app_window) {

+ extensions::ShellAppWindow* app_window) {

// 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') | build/all.gyp » ('j') | no next file with comments »