components/keyed_service/content/browser_context_dependency_manager.h - Issue 1308823002: Move Singleton and related structs to namespace base

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_dependency_manager.h

Issue 1308823002: Move Singleton and related structs to namespace base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add blank lines Created 5 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

« chromecast/media/base/media_message_loop.h ('K') | « components/feedback/feedback_uploader_factory.cc ('k') | components/keyed_service/content/browser_context_dependency_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/keyed_service/content/browser_context_dependency_manager.h

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

index 4a2fdbcf0e4435a3bc7ce5e6502adb276f54816a..42173b28a0a47fa4cee9801194d792141880a1ff 100644

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

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

@@ -11,8 +11,11 @@

#include "components/keyed_service/core/keyed_service_export.h"

class BrowserContextKeyedBaseFactory;

+namespace base {

template <typename T>

struct DefaultSingletonTraits;

+} // namespace base

namespace content {

class BrowserContext;

@@ -80,7 +83,7 @@ class KEYED_SERVICE_EXPORT BrowserContextDependencyManager

private:

friend class BrowserContextDependencyManagerUnittests;

- friend struct DefaultSingletonTraits<BrowserContextDependencyManager>;

+ friend struct base::DefaultSingletonTraits<BrowserContextDependencyManager>;

// Helper function used by CreateBrowserContextServices[ForTest].

void DoCreateBrowserContextServices(content::BrowserContext* context,