ipc/ipc_channel_posix.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: ipc/ipc_channel_posix.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

Index: ipc/ipc_channel_posix.cc

diff --git a/ipc/ipc_channel_posix.cc b/ipc/ipc_channel_posix.cc

index a3b5ae1e52c3f5d0d3e9d0b01f15d3abed0aed79..854f308e2bef495500c87357050401029fcdc30e 100644

--- a/ipc/ipc_channel_posix.cc

+++ b/ipc/ipc_channel_posix.cc

@@ -95,9 +95,7 @@ namespace {

class PipeMap {

public:

- static PipeMap* GetInstance() {

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

- }

+ static PipeMap* GetInstance() { return base::Singleton<PipeMap>::get(); }

~PipeMap() {

// Shouldn't have left over pipes.

@@ -139,7 +137,7 @@ class PipeMap {

typedef std::map<std::string, int> ChannelToFDMap;

ChannelToFDMap map_;

- friend struct DefaultSingletonTraits<PipeMap>;

+ friend struct base::DefaultSingletonTraits<PipeMap>;

#if defined(OS_ANDROID)

friend void ::IPC::Channel::NotifyProcessForkedForTesting();

#endif

« no previous file with comments | « ios/web/webui/web_ui_ios_controller_factory_registry.cc ('k') | ipc/ipc_logging.h » ('j') | no next file with comments »