chrome/browser/speech/tts_win.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/speech/tts_win.cc

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

Patch Set: git cl format 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

« no previous file with comments | « chrome/browser/speech/tts_mac.mm ('k') | chrome/browser/spellchecker/spellcheck_factory.h » ('j') | components/keyed_service/content/browser_context_dependency_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/speech/tts_win.cc

diff --git a/chrome/browser/speech/tts_win.cc b/chrome/browser/speech/tts_win.cc

index 1886bd0d660385388a9e39403a457b1dea774136..ac258205889449b9658ac9df78d4ee35313bd9d5 100644

--- a/chrome/browser/speech/tts_win.cc

+++ b/chrome/browser/speech/tts_win.cc

@@ -57,7 +57,7 @@ class TtsPlatformImplWin : public TtsPlatformImpl {

int char_position_;

bool paused_;

- friend struct DefaultSingletonTraits<TtsPlatformImplWin>;

+ friend struct base::DefaultSingletonTraits<TtsPlatformImplWin>;

DISALLOW_COPY_AND_ASSIGN(TtsPlatformImplWin);

};

@@ -248,8 +248,8 @@ TtsPlatformImplWin::TtsPlatformImplWin()

// static

TtsPlatformImplWin* TtsPlatformImplWin::GetInstance() {

- return Singleton<TtsPlatformImplWin,

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

+ return base::Singleton<TtsPlatformImplWin,

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

}

// static