| Index: chrome/renderer/tts_dispatcher.h
|
| diff --git a/chrome/renderer/tts_dispatcher.h b/chrome/renderer/tts_dispatcher.h
|
| index 81f5c45dc2c42c617de14bdfdd5606a61a5bc99a..c46327591c76a767dddec231e4245f7ada20d98b 100644
|
| --- a/chrome/renderer/tts_dispatcher.h
|
| +++ b/chrome/renderer/tts_dispatcher.h
|
| @@ -28,10 +28,10 @@ struct TtsVoice;
|
| // so each one routes IPC messages to its WebSpeechSynthesizerClient only if
|
| // the utterance id (which is globally unique) matches.
|
| class TtsDispatcher
|
| - : public WebKit::WebSpeechSynthesizer,
|
| + : public blink::WebSpeechSynthesizer,
|
| public content::RenderProcessObserver {
|
| public:
|
| - explicit TtsDispatcher(WebKit::WebSpeechSynthesizerClient* client);
|
| + explicit TtsDispatcher(blink::WebSpeechSynthesizerClient* client);
|
|
|
| private:
|
| virtual ~TtsDispatcher();
|
| @@ -39,15 +39,15 @@ class TtsDispatcher
|
| // RenderProcessObserver override.
|
| virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE;
|
|
|
| - // WebKit::WebSpeechSynthesizer implementation.
|
| + // blink::WebSpeechSynthesizer implementation.
|
| virtual void updateVoiceList() OVERRIDE;
|
| - virtual void speak(const WebKit::WebSpeechSynthesisUtterance& utterance)
|
| + virtual void speak(const blink::WebSpeechSynthesisUtterance& utterance)
|
| OVERRIDE;
|
| virtual void pause() OVERRIDE;
|
| virtual void resume() OVERRIDE;
|
| virtual void cancel() OVERRIDE;
|
|
|
| - WebKit::WebSpeechSynthesisUtterance FindUtterance(int utterance_id);
|
| + blink::WebSpeechSynthesisUtterance FindUtterance(int utterance_id);
|
|
|
| void OnSetVoiceList(const std::vector<TtsVoice>& voices);
|
| void OnDidStartSpeaking(int utterance_id);
|
| @@ -64,13 +64,13 @@ class TtsDispatcher
|
|
|
| // The WebKit client class that we use to send events back to the JS world.
|
| // Weak reference, this will be valid as long as this object exists.
|
| - WebKit::WebSpeechSynthesizerClient* synthesizer_client_;
|
| + blink::WebSpeechSynthesizerClient* synthesizer_client_;
|
|
|
| // Next utterance id, used to map response IPCs to utterance objects.
|
| static int next_utterance_id_;
|
|
|
| // Map from id to utterance objects.
|
| - base::hash_map<int, WebKit::WebSpeechSynthesisUtterance> utterance_id_map_;
|
| + base::hash_map<int, blink::WebSpeechSynthesisUtterance> utterance_id_map_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TtsDispatcher);
|
| };
|
|
|