chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.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: chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.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

« base/memory/singleton.h ('K') | « chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service_factory.cc ('k') | chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.cc » ('j') | chromecast/media/base/media_message_loop.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h

diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h

index 4c85d4fe6c47c33aa3e27eddcc102e41b2dab285..df0c0db55892f1223ee8d29af96e738dd9a8f960 100644

--- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h

+++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h

@@ -14,7 +14,11 @@ namespace content {

class BrowserContext;

}

-template <typename T> struct DefaultSingletonTraits;

+namespace base {

+template <typename T>

+struct DefaultSingletonTraits;

+} // namespace base

class EasyUnlockTpmKeyManager;

// Singleton factory that builds and owns all EasyUnlockTpmKeyManager services.

@@ -27,7 +31,7 @@ class EasyUnlockTpmKeyManagerFactory

static EasyUnlockTpmKeyManager* GetForUser(const std::string& user_id);

private:

- friend struct DefaultSingletonTraits<EasyUnlockTpmKeyManagerFactory>;

+ friend struct base::DefaultSingletonTraits<EasyUnlockTpmKeyManagerFactory>;

EasyUnlockTpmKeyManagerFactory();

~EasyUnlockTpmKeyManagerFactory() override;