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

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

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 years, 6 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
Index: chrome/browser/speech/tts_mac.mm
diff --git a/chrome/browser/speech/tts_mac.mm b/chrome/browser/speech/tts_mac.mm
index bdb9b1cd7b72f380a158b48f37b4bc2de9c91ae2..a5a8aec33bad615b30082e80a73b5cac3401b2d3 100644
--- a/chrome/browser/speech/tts_mac.mm
+++ b/chrome/browser/speech/tts_mac.mm
@@ -4,7 +4,7 @@
#include <string>
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/memory/singleton.h"
#include "base/strings/sys_string_conversions.h"
#include "base/values.h"
@@ -38,7 +38,7 @@ class TtsPlatformImplMac;
// crash when trying to call willSpeakWord.
@interface SingleUseSpeechSynthesizer : NSSpeechSynthesizer {
@private
- scoped_nsobject<NSString> utterance_;
+ base::scoped_nsobject<NSString> utterance_;
bool didSpeak_;
}
@@ -85,8 +85,8 @@ class TtsPlatformImplMac : public TtsPlatformImpl {
TtsPlatformImplMac();
virtual ~TtsPlatformImplMac();
- scoped_nsobject<SingleUseSpeechSynthesizer> speech_synthesizer_;
- scoped_nsobject<ChromeTtsDelegate> delegate_;
+ base::scoped_nsobject<SingleUseSpeechSynthesizer> speech_synthesizer_;
+ base::scoped_nsobject<ChromeTtsDelegate> delegate_;
int utterance_id_;
std::string utterance_;
bool sent_start_event_;

Powered by Google App Engine
This is Rietveld 408576698