net/ftp/ftp_util.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: net/ftp/ftp_util.cc

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

Patch Set: Fix more errors 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

« ios/chrome/browser/favicon/favicon_service_factory.h ('K') | « net/cert/x509_certificate_openssl.cc ('k') | net/proxy/in_process_mojo_proxy_resolver_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/ftp/ftp_util.cc

diff --git a/net/ftp/ftp_util.cc b/net/ftp/ftp_util.cc

index 91854c4b45b09fd9d6c464a7bf8272c12b330ccf..e398d457950860477723a91965ac53e46667d0a1 100644

--- a/net/ftp/ftp_util.cc

+++ b/net/ftp/ftp_util.cc

@@ -132,7 +132,7 @@ namespace {

class AbbreviatedMonthsMap {

public:

static AbbreviatedMonthsMap* GetInstance() {

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

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

}

// Converts abbreviated month name |text| to its number (in range 1-12).

@@ -150,7 +150,7 @@ class AbbreviatedMonthsMap {

}

private:

- friend struct DefaultSingletonTraits<AbbreviatedMonthsMap>;

+ friend struct base::DefaultSingletonTraits<AbbreviatedMonthsMap>;

// Constructor, initializes the map based on ICU data. It is much faster

// to do that just once.