chrome/browser/extensions/extension_assets_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_assets_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: ToT Created 5 years, 3 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 | « chrome/browser/extensions/extension_action_manager.cc ('k') | chrome/browser/extensions/extension_assets_manager_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_assets_manager.cc

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

index bdb862da21680f33b89ecb0833f5beaa70b56fc7..b1921fb97d11bc4917faa8d29bdc914f13794217 100644

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

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

@@ -18,7 +18,7 @@ namespace {

class ExtensionAssetsManagerImpl : public ExtensionAssetsManager {

public:

static ExtensionAssetsManagerImpl* GetInstance() {

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

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

}

// Override from ExtensionAssetsManager.

@@ -42,7 +42,7 @@ class ExtensionAssetsManagerImpl : public ExtensionAssetsManager {

}

private:

- friend struct DefaultSingletonTraits<ExtensionAssetsManagerImpl>;

+ friend struct base::DefaultSingletonTraits<ExtensionAssetsManagerImpl>;

ExtensionAssetsManagerImpl() {}

~ExtensionAssetsManagerImpl() override {}