components/keyed_service/content/browser_context_keyed_service_factory.h - Issue 1090373003: Allow cross dependencies between BCKSF and BSKSF

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: components/keyed_service/content/browser_context_keyed_service_factory.h

Issue 1090373003: Allow cross dependencies between BCKSF and BSKSF (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix dependencies and DCHECK in Get{Original,Underlying}ContextInternal Created 5 years, 8 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

« no previous file with comments | « components/keyed_service/content/browser_context_keyed_base_factory.cc ('k') | components/keyed_service/content/browser_context_keyed_service_factory.cc » ('j') | components/keyed_service/core/keyed_service_base_factory.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/keyed_service/content/browser_context_keyed_service_factory.h

diff --git a/components/keyed_service/content/browser_context_keyed_service_factory.h b/components/keyed_service/content/browser_context_keyed_service_factory.h

index dde840d0e5bb229052db4f2ea064a4ab736118d6..e5f718a353ea79665de28e7497219733b576cd49 100644

--- a/components/keyed_service/content/browser_context_keyed_service_factory.h

+++ b/components/keyed_service/content/browser_context_keyed_service_factory.h

@@ -124,7 +124,7 @@ class KEYED_SERVICE_EXPORT BrowserContextKeyedServiceFactory

friend class BrowserContextDependencyManagerUnittests;

// Registers any user preferences on this service. This is called by

- // RegisterProfilePrefsIfNecessary() and should be overriden by any service

+ // RegisterPrefsIfNecessaryForContext() and should be overriden by any service

// that wants to register profile-specific preferences.

virtual void RegisterProfilePrefs(

user_prefs::PrefRegistrySyncable* registry) {}

@@ -135,8 +135,10 @@ class KEYED_SERVICE_EXPORT BrowserContextKeyedServiceFactory

bool IsOffTheRecord(base::SupportsUserData* context) const final;

// KeyedServiceBaseFactory:

- user_prefs::PrefRegistrySyncable* GetAssociatedPrefRegistry(

- base::SupportsUserData* context) const final;

+ base::SupportsUserData* GetUnderlyingContextInternal(

+ base::SupportsUserData* context) const override;

+ base::SupportsUserData* GetOriginalContextInternal(

+ base::SupportsUserData* context) const override;

base::SupportsUserData* GetContextToUse(

base::SupportsUserData* context) const final;

bool ServiceIsCreatedWithContext() const final;