athena/content/public/content_activity_factory.h - Issue 335003003: Introduces AppActivity and handler of chrome.shell API.

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

Issue 335003003: Introduces AppActivity and handler of chrome.shell API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: AppWindow ownership Created 6 years, 6 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/public/content_activity_factory.h

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

index 70e5ec464c09a716617b2021b8f47c1e358a9489..2698123fc76bcc91f549d7589c75b2004f8d7377 100644

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

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

@@ -19,8 +19,8 @@ class ATHENA_EXPORT ContentActivityFactory : public ActivityFactory {

// Overridden from ActivityFactory:

virtual Activity* CreateWebActivity(content::BrowserContext* browser_context,

const GURL& url) OVERRIDE;

- virtual Activity* CreateAppActivity(content::BrowserContext* browser_context,

- const std::string& app_id) OVERRIDE;

+ virtual Activity* CreateAppActivity(

+ apps::ShellAppWindow* app_window) OVERRIDE;

private:

DISALLOW_COPY_AND_ASSIGN(ContentActivityFactory);