chrome/browser/chromeos/file_manager/volume_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/file_manager/volume_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/extensions/users_private/users_private_delegate_factory.cc ('k') | chrome/browser/chromeos/file_manager/volume_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/file_manager/volume_manager_factory.h

diff --git a/chrome/browser/chromeos/file_manager/volume_manager_factory.h b/chrome/browser/chromeos/file_manager/volume_manager_factory.h

index 7255a516f669b1f7ac4cfa58b994c9519aad465d..7a87d9b58cb040d9e98bdd6def015c68e9601933 100644

--- a/chrome/browser/chromeos/file_manager/volume_manager_factory.h

+++ b/chrome/browser/chromeos/file_manager/volume_manager_factory.h

@@ -8,7 +8,10 @@

#ifndef CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_FACTORY_H_

#define CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_FACTORY_H_

-template<typename T> struct DefaultSingletonTraits;

+namespace base {

+template <typename T>

+struct DefaultSingletonTraits;

+} // namespace base

namespace content {

class BrowserContext;

@@ -39,7 +42,7 @@ class VolumeManagerFactory : public BrowserContextKeyedServiceFactory {

private:

// For Singleton.

- friend struct DefaultSingletonTraits<VolumeManagerFactory>;

+ friend struct base::DefaultSingletonTraits<VolumeManagerFactory>;

VolumeManagerFactory();

~VolumeManagerFactory() override;