chrome/browser/extensions/api/braille_display_private/braille_controller_stub.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/api/braille_display_private/braille_controller_stub.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/extensions/api/braille_display_private/braille_controller_brlapi.cc ('k') | chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/braille_display_private/braille_controller_stub.cc

diff --git a/chrome/browser/extensions/api/braille_display_private/braille_controller_stub.cc b/chrome/browser/extensions/api/braille_display_private/braille_controller_stub.cc

index bd7b813633a2707c9104cca9ae9d446bb23db107..e2413b6e4ededa13a5330ce7e877b2d6904f0156 100644

--- a/chrome/browser/extensions/api/braille_display_private/braille_controller_stub.cc

+++ b/chrome/browser/extensions/api/braille_display_private/braille_controller_stub.cc

@@ -25,7 +25,7 @@ class BrailleControllerImpl : public BrailleController {

private:

BrailleControllerImpl();

~BrailleControllerImpl() override;

- friend struct DefaultSingletonTraits<BrailleControllerImpl>;

+ friend struct base::DefaultSingletonTraits<BrailleControllerImpl>;

DISALLOW_COPY_AND_ASSIGN(BrailleControllerImpl);

};

@@ -48,8 +48,9 @@ BrailleControllerImpl::~BrailleControllerImpl() {

// static

BrailleControllerImpl* BrailleControllerImpl::GetInstance() {

- return Singleton<BrailleControllerImpl,

- LeakySingletonTraits<BrailleControllerImpl> >::get();

+ return base::Singleton<

+ BrailleControllerImpl,

+ base::LeakySingletonTraits<BrailleControllerImpl>>::get();

}

scoped_ptr<DisplayState> BrailleControllerImpl::GetDisplayState() {