athena/content/content_activity_factory.h - Issue 494033002: Move AppWindow to extensions

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/content_activity_factory.h

Issue 494033002: Move AppWindow to extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove unneeded include in chrome_shell_delegate.cc 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: athena/content/content_activity_factory.h

diff --git a/athena/content/content_activity_factory.h b/athena/content/content_activity_factory.h

index bf3031c69c2444b81ae504063e277f3bdb5d7fb4..d118c819add0af590bad6fd207816940ba2ddcfa 100644

--- a/athena/content/content_activity_factory.h

+++ b/athena/content/content_activity_factory.h

@@ -20,7 +20,8 @@ class ContentActivityFactory : public ActivityFactory {

const GURL& url) OVERRIDE;

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

const std::string& app_id) OVERRIDE;

- virtual Activity* CreateAppActivity(apps::AppWindow* app_window) OVERRIDE;

+ virtual Activity* CreateAppActivity(

+ extensions::AppWindow* app_window) OVERRIDE;

private:

DISALLOW_COPY_AND_ASSIGN(ContentActivityFactory);