Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / mojo / system / local_message_pipe_endpoint.h

diff --git a/src/mojo/system/local_message_pipe_endpoint.h b/src/mojo/system/local_message_pipe_endpoint.h
index 9e200f1..d30f54b 100644 (file)
--- a/src/mojo/system/local_message_pipe_endpoint.h
+++ b/src/mojo/system/local_message_pipe_endpoint.h
@@ -24,18 +24,18 @@ class MOJO_SYSTEM_IMPL_EXPORT LocalMessagePipeEndpoint
 
   // |MessagePipeEndpoint| implementation:
   virtual Type GetType() const OVERRIDE;
-  virtual void Close() OVERRIDE;
-  virtual void OnPeerClose() OVERRIDE;
+  virtual bool OnPeerClose() OVERRIDE;
   virtual void EnqueueMessage(scoped_ptr<MessageInTransit> message) OVERRIDE;
 
   // There's a dispatcher for |LocalMessagePipeEndpoint|s, so we have to
   // implement/override these:
+  virtual void Close() OVERRIDE;
   virtual void CancelAllWaiters() OVERRIDE;
-  virtual MojoResult ReadMessage(
-      void* bytes, uint32_t* num_bytes,
-      std::vector<scoped_refptr<Dispatcher> >* dispatchers,
-      uint32_t* num_dispatchers,
-      MojoReadMessageFlags flags) OVERRIDE;
+  virtual MojoResult ReadMessage(void* bytes,
+                                 uint32_t* num_bytes,
+                                 DispatcherVector* dispatchers,
+                                 uint32_t* num_dispatchers,
+                                 MojoReadMessageFlags flags) OVERRIDE;
   virtual MojoResult AddWaiter(Waiter* waiter,
                                MojoWaitFlags flags,
                                MojoResult wake_result) OVERRIDE;