athena/content/public/app_registry.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/content/public/app_registry.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

« athena/content/app_activity.cc ('K') | « athena/content/public/app_content_control_delegate.h ('k') | athena/content/shell/content_activity_factory.cc » ('j') | athena/extensions/shell/extensions_delegate_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: athena/content/public/app_registry.h

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

index c296f2e3b780c2f80746355519747b73a4789609..095beba24851775485e849603bd581c49454e3b8 100644

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

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

@@ -19,7 +19,6 @@ class BrowserContext;

namespace athena {

class AppActivityRegistry;

-class AppContentControlDelegate;

class AppRegistryImpl;

// This class holds for each application, held by a user, a list of activities.

@@ -37,14 +36,6 @@ class ATHENA_EXPORT AppRegistry {

// Shuts down the registry (all applications should be shut down by then).

static void ShutDown();

- // Overrides the used AppContentDelegate. This function will own it

- // afterwards. A value of NULL is invalid.

- virtual void SetDelegate(AppContentControlDelegate* delegate) = 0;

- // Retrieves the application content delegate. The ownership remains with this

- // class.

- virtual AppContentControlDelegate* GetDelegate() = 0;

// Returns an |AppActivityRegistry| for a given activity |app_id| and

// |browser_context|.

virtual AppActivityRegistry* GetAppActivityRegistry(