Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1933)

Unified Diff: chrome/browser/speech/tts_linux.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/speech/tts_controller_impl.cc ('k') | chrome/browser/speech/tts_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/speech/tts_linux.cc
diff --git a/chrome/browser/speech/tts_linux.cc b/chrome/browser/speech/tts_linux.cc
index 05360b1868aa05a8b6df55abf60a3eea31d80321..ba15516ce03688052dd06e583bb99a34f5390b86 100644
--- a/chrome/browser/speech/tts_linux.cc
+++ b/chrome/browser/speech/tts_linux.cc
@@ -83,7 +83,7 @@ class TtsPlatformImplLinux : public TtsPlatformImpl {
// uniquely identify a voice across all available modules.
scoped_ptr<std::map<std::string, SPDChromeVoice> > all_native_voices_;
- friend struct DefaultSingletonTraits<TtsPlatformImplLinux>;
+ friend struct base::DefaultSingletonTraits<TtsPlatformImplLinux>;
DISALLOW_COPY_AND_ASSIGN(TtsPlatformImplLinux);
};
@@ -346,8 +346,9 @@ void TtsPlatformImplLinux::IndexMarkCallback(size_t msg_id,
// static
TtsPlatformImplLinux* TtsPlatformImplLinux::GetInstance() {
- return Singleton<TtsPlatformImplLinux,
- LeakySingletonTraits<TtsPlatformImplLinux> >::get();
+ return base::Singleton<
+ TtsPlatformImplLinux,
+ base::LeakySingletonTraits<TtsPlatformImplLinux>>::get();
}
// static
« no previous file with comments | « chrome/browser/speech/tts_controller_impl.cc ('k') | chrome/browser/speech/tts_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698