Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / plugin / plugin_channel.h

diff --git a/src/content/plugin/plugin_channel.h b/src/content/plugin/plugin_channel.h
index ffe5c79..d3106b3 100644 (file)
--- a/src/content/plugin/plugin_channel.h
+++ b/src/content/plugin/plugin_channel.h
@@ -33,17 +33,17 @@ class PluginChannel : public NPChannelBase {
   static void NotifyRenderersOfPendingShutdown();
 
   // IPC::Listener:
-  virtual bool Send(IPC::Message* msg) OVERRIDE;
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual void OnChannelError() OVERRIDE;
+  bool Send(IPC::Message* msg) override;
+  bool OnMessageReceived(const IPC::Message& message) override;
+  void OnChannelError() override;
 
   int renderer_id() { return renderer_id_; }
 
-  virtual int GenerateRouteID() OVERRIDE;
+  int GenerateRouteID() override;
 
   // Returns the event that's set when a call to the renderer causes a modal
   // dialog to come up.
-  virtual base::WaitableEvent* GetModalDialogEvent(int render_view_id) OVERRIDE;
+  base::WaitableEvent* GetModalDialogEvent(int render_view_id) override;
 
   bool in_send() { return in_send_ != 0; }
 
@@ -51,19 +51,19 @@ class PluginChannel : public NPChannelBase {
   void set_incognito(bool value) { incognito_ = value; }
 
 #if defined(OS_POSIX)
-  int TakeRendererFileDescriptor() {
+  base::ScopedFD TakeRendererFileDescriptor() {
     return channel_->TakeClientFileDescriptor();
   }
 #endif
 
  protected:
-  virtual ~PluginChannel();
+  ~PluginChannel() override;
 
   // NPChannelBase::
-  virtual void CleanUp() OVERRIDE;
-  virtual bool Init(base::MessageLoopProxy* ipc_message_loop,
-                    bool create_pipe_now,
-                    base::WaitableEvent* shutdown_event) OVERRIDE;
+  void CleanUp() override;
+  bool Init(base::MessageLoopProxy* ipc_message_loop,
+            bool create_pipe_now,
+            base::WaitableEvent* shutdown_event) override;
 
  private:
   class MessageFilter;
@@ -71,7 +71,7 @@ class PluginChannel : public NPChannelBase {
   // Called on the plugin thread
   PluginChannel();
 
-  virtual bool OnControlMessageReceived(const IPC::Message& msg) OVERRIDE;
+  bool OnControlMessageReceived(const IPC::Message& msg) override;
 
   static NPChannelBase* ClassFactory() { return new PluginChannel(); }