chrome/browser/chromeos/drive/drive_integration_service.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/chromeos/drive/drive_integration_service.cc

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/drive/drive_integration_service.h ('k') | chrome/browser/chromeos/events/system_key_event_listener.h » ('j') | chromecast/media/base/media_message_loop.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/drive/drive_integration_service.cc

diff --git a/chrome/browser/chromeos/drive/drive_integration_service.cc b/chrome/browser/chromeos/drive/drive_integration_service.cc

index c98cd19febfd6841325312db3a12c923b128d7cd..e6f9845cab6f38f90ab27292634ac65b93754bf9 100644

--- a/chrome/browser/chromeos/drive/drive_integration_service.cc

+++ b/chrome/browser/chromeos/drive/drive_integration_service.cc

@@ -605,7 +605,7 @@ DriveIntegrationService* DriveIntegrationServiceFactory::FindForProfile(

// static

DriveIntegrationServiceFactory* DriveIntegrationServiceFactory::GetInstance() {

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

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

}

DriveIntegrationServiceFactory::DriveIntegrationServiceFactory()