chrome/browser/extensions/activity_log/activity_log.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/activity_log/activity_log.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/enumerate_modules_model_win.cc ('k') | chrome/browser/extensions/api/autofill_private/autofill_private_event_router_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/activity_log/activity_log.cc

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

index db15fd30751bded06568de9827a284491c7774ee..346623c9c96154c9383d817bb7f09cce149e18b7 100644

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

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

@@ -154,7 +154,7 @@ static const ApiInfo kApiInfoTable[] = {

class ApiInfoDatabase {

public:

static ApiInfoDatabase* GetInstance() {

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

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

}

// Retrieves an ApiInfo record for the given Action type. Returns either a

@@ -184,7 +184,7 @@ class ApiInfoDatabase {

// should still be checked before returning a positive match.

std::map<std::string, const ApiInfo*> api_database_;

- friend struct DefaultSingletonTraits<ApiInfoDatabase>;

+ friend struct base::DefaultSingletonTraits<ApiInfoDatabase>;

DISALLOW_COPY_AND_ASSIGN(ApiInfoDatabase);

};