chrome/browser/extensions/extension_action_manager.cc - 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: chrome/browser/extensions/extension_action_manager.cc

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

Patch Set: Remove todo 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

« base/trace_event/trace_log.cc ('K') | « chrome/browser/extensions/error_console/error_console_factory.cc ('k') | chrome/browser/extensions/extension_assets_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_action_manager.cc

diff --git a/chrome/browser/extensions/extension_action_manager.cc b/chrome/browser/extensions/extension_action_manager.cc

index 7e0f40106cf35b75b054e382c3ad1e6080065a09..2bc8ba66ebab255bd9a16fc368475f56a647eb52 100644

--- a/chrome/browser/extensions/extension_action_manager.cc

+++ b/chrome/browser/extensions/extension_action_manager.cc

@@ -30,7 +30,7 @@ class ExtensionActionManagerFactory : public BrowserContextKeyedServiceFactory {

static ExtensionActionManagerFactory* GetInstance();

private:

- friend struct DefaultSingletonTraits<ExtensionActionManagerFactory>;

+ friend struct base::DefaultSingletonTraits<ExtensionActionManagerFactory>;

ExtensionActionManagerFactory()

: BrowserContextKeyedServiceFactory(

@@ -51,7 +51,7 @@ class ExtensionActionManagerFactory : public BrowserContextKeyedServiceFactory {

ExtensionActionManagerFactory*

ExtensionActionManagerFactory::GetInstance() {

- return Singleton<ExtensionActionManagerFactory>::get();

+ return base::Singleton<ExtensionActionManagerFactory>::get();

}

} // namespace