Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / renderer / tts_dispatcher.h

diff --git a/src/chrome/renderer/tts_dispatcher.h b/src/chrome/renderer/tts_dispatcher.h
index 81f5c45..cc40403 100644 (file)
--- a/src/chrome/renderer/tts_dispatcher.h
+++ b/src/chrome/renderer/tts_dispatcher.h
@@ -28,26 +28,26 @@ 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();
 
   // RenderProcessObserver override.
-  virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE;
+  bool OnControlMessageReceived(const IPC::Message& message) override;
 
-  // WebKit::WebSpeechSynthesizer implementation.
-  virtual void updateVoiceList() OVERRIDE;
-  virtual void speak(const WebKit::WebSpeechSynthesisUtterance& utterance)
-      OVERRIDE;
-  virtual void pause() OVERRIDE;
-  virtual void resume() OVERRIDE;
-  virtual void cancel() OVERRIDE;
+  // blink::WebSpeechSynthesizer implementation.
+  virtual void updateVoiceList() override;
+  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);
 };