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

Unified Diff: chrome/browser/speech/tts_mac.mm

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_linux.cc ('k') | chrome/browser/speech/tts_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/speech/tts_mac.mm
diff --git a/chrome/browser/speech/tts_mac.mm b/chrome/browser/speech/tts_mac.mm
index 21aa9a23dd8138d9132a14873cb449c6dc632a0e..a492dd54c4772a28af521f86c517d3a9b4ea0a6e 100644
--- a/chrome/browser/speech/tts_mac.mm
+++ b/chrome/browser/speech/tts_mac.mm
@@ -89,7 +89,7 @@ class TtsPlatformImplMac : public TtsPlatformImpl {
int last_char_index_;
bool paused_;
- friend struct DefaultSingletonTraits<TtsPlatformImplMac>;
+ friend struct base::DefaultSingletonTraits<TtsPlatformImplMac>;
DISALLOW_COPY_AND_ASSIGN(TtsPlatformImplMac);
};
@@ -289,7 +289,7 @@ TtsPlatformImplMac::~TtsPlatformImplMac() {
// static
TtsPlatformImplMac* TtsPlatformImplMac::GetInstance() {
- return Singleton<TtsPlatformImplMac>::get();
+ return base::Singleton<TtsPlatformImplMac>::get();
}
@implementation ChromeTtsDelegate
« no previous file with comments | « chrome/browser/speech/tts_linux.cc ('k') | chrome/browser/speech/tts_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698