Rename (Host|Client)Message to Chromoting(Host|Client)Message.

Rename HostMessage and ClientMessage to Chromoting{Host|Client}Message to
avoid conflicts with messages in X11.

Actually, only ClientMessage needs to be changed due to conflict, but HostMessage is changed to keep the names consistent.

BUG=none
TEST=remoting unittests

Review URL: http://codereview.chromium.org/3161034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57112 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 32 insertions, 32 deletions

diff --git a/remoting/client/chromoting_client.cc b/remoting/client/chromoting_client.cc
index 76f5b0c8..9226186 100644
--- a/remoting/client/chromoting_client.cc
+++ b/remoting/client/chromoting_client.cc
@@ -105,7 +105,7 @@ void ChromotingClient::HandleMessages(HostConnection* conn,
   }
 
   for (size_t i = 0; i < messages->size(); ++i) {
-    HostMessage* msg = (*messages)[i];
+    ChromotingHostMessage* msg = (*messages)[i];
     // TODO(ajwong): Consider creating a macro similar to the IPC message
     // mappings.  Also reconsider the lifetime of the message object.
     if (msg->has_init_client()) {
@@ -175,10 +175,10 @@ void ChromotingClient::SetState(State s) {
   Repaint();
 }
 
-void ChromotingClient::InitClient(HostMessage* msg) {
+void ChromotingClient::InitClient(ChromotingHostMessage* msg) {
   DCHECK_EQ(message_loop(), MessageLoop::current());
   DCHECK(msg->has_init_client());
-  scoped_ptr<HostMessage> deleter(msg);
+  scoped_ptr<ChromotingHostMessage> deleter(msg);
 
   // Resize the window.
   int width = msg->init_client().width();
@@ -191,21 +191,21 @@ void ChromotingClient::InitClient(HostMessage* msg) {
   input_handler_->Initialize();
 }
 
-void ChromotingClient::BeginUpdate(HostMessage* msg) {
+void ChromotingClient::BeginUpdate(ChromotingHostMessage* msg) {
   DCHECK_EQ(message_loop(), MessageLoop::current());
   DCHECK(msg->has_begin_update_stream());
 
   view_->HandleBeginUpdateStream(msg);
 }
 
-void ChromotingClient::HandleUpdate(HostMessage* msg) {
+void ChromotingClient::HandleUpdate(ChromotingHostMessage* msg) {
   DCHECK_EQ(message_loop(), MessageLoop::current());
   DCHECK(msg->has_update_stream_packet());
 
   view_->HandleUpdateStreamPacket(msg);
 }
 
-void ChromotingClient::EndUpdate(HostMessage* msg) {
+void ChromotingClient::EndUpdate(ChromotingHostMessage* msg) {
   DCHECK_EQ(message_loop(), MessageLoop::current());
   DCHECK(msg->has_end_update_stream());
 
diff --git a/remoting/client/chromoting_client.h b/remoting/client/chromoting_client.h
index bdc2e26..c7026e3 100644
--- a/remoting/client/chromoting_client.h
+++ b/remoting/client/chromoting_client.h
@@ -65,10 +65,10 @@ class ChromotingClient : public HostConnection::HostEventCallback {
   void SetState(State s);
 
   // Handles for chromotocol messages.
-  void InitClient(HostMessage* msg);
-  void BeginUpdate(HostMessage* msg);
-  void HandleUpdate(HostMessage* msg);
-  void EndUpdate(HostMessage* msg);
+  void InitClient(ChromotingHostMessage* msg);
+  void BeginUpdate(ChromotingHostMessage* msg);
+  void HandleUpdate(ChromotingHostMessage* msg);
+  void EndUpdate(ChromotingHostMessage* msg);
 
   // The following are not owned by this class.
   ClientConfig config_;
diff --git a/remoting/client/chromoting_view.h b/remoting/client/chromoting_view.h
index a50b407..e094f79 100644
--- a/remoting/client/chromoting_view.h
+++ b/remoting/client/chromoting_view.h
@@ -9,7 +9,7 @@
 
 namespace remoting {
 
-class HostMessage;
+class ChromotingHostMessage;
 
 // ChromotingView defines the behavior of an object that draws a view of the
 // remote desktop. Its main function is to choose the right decoder and render
@@ -47,13 +47,13 @@ class ChromotingView {
   virtual void SetHostScreenSize(int width, int height) = 0;
 
   // Handle the BeginUpdateStream message.
-  virtual void HandleBeginUpdateStream(HostMessage* msg) = 0;
+  virtual void HandleBeginUpdateStream(ChromotingHostMessage* msg) = 0;
 
   // Handle the UpdateStreamPacket message.
-  virtual void HandleUpdateStreamPacket(HostMessage* msg) = 0;
+  virtual void HandleUpdateStreamPacket(ChromotingHostMessage* msg) = 0;
 
   // Handle the EndUpdateStream message.
-  virtual void HandleEndUpdateStream(HostMessage* msg) = 0;
+  virtual void HandleEndUpdateStream(ChromotingHostMessage* msg) = 0;
 };
 
 }  // namespace remoting
diff --git a/remoting/client/plugin/pepper_view.cc b/remoting/client/plugin/pepper_view.cc
index 6715888..25c16bf 100644
--- a/remoting/client/plugin/pepper_view.cc
+++ b/remoting/client/plugin/pepper_view.cc
@@ -139,7 +139,7 @@ void PepperView::SetHostScreenSize(int width, int height) {
   backing_store_height_ = height;
 }
 
-void PepperView::HandleBeginUpdateStream(HostMessage* msg) {
+void PepperView::HandleBeginUpdateStream(ChromotingHostMessage* msg) {
   if (!instance_->CurrentlyOnPluginThread()) {
     RunTaskOnPluginThread(
         NewRunnableMethod(this, &PepperView::HandleBeginUpdateStream,
@@ -147,7 +147,7 @@ void PepperView::HandleBeginUpdateStream(HostMessage* msg) {
     return;
   }
 
-  scoped_ptr<HostMessage> deleter(msg);
+  scoped_ptr<ChromotingHostMessage> deleter(msg);
 
   // TODO(hclam): Use the information from the message to create the decoder.
   // We lazily construct the decoder.
@@ -169,7 +169,7 @@ void PepperView::HandleBeginUpdateStream(HostMessage* msg) {
       NewRunnableMethod(this, &PepperView::OnDecodeDone));
 }
 
-void PepperView::HandleUpdateStreamPacket(HostMessage* msg) {
+void PepperView::HandleUpdateStreamPacket(ChromotingHostMessage* msg) {
   if (!instance_->CurrentlyOnPluginThread()) {
     RunTaskOnPluginThread(
         NewRunnableMethod(this, &PepperView::HandleUpdateStreamPacket,
@@ -180,7 +180,7 @@ void PepperView::HandleUpdateStreamPacket(HostMessage* msg) {
   decoder_->PartialDecode(msg);
 }
 
-void PepperView::HandleEndUpdateStream(HostMessage* msg) {
+void PepperView::HandleEndUpdateStream(ChromotingHostMessage* msg) {
   if (!instance_->CurrentlyOnPluginThread()) {
     RunTaskOnPluginThread(
         NewRunnableMethod(this, &PepperView::HandleEndUpdateStream,
@@ -188,7 +188,7 @@ void PepperView::HandleEndUpdateStream(HostMessage* msg) {
     return;
   }
 
-  scoped_ptr<HostMessage> deleter(msg);
+  scoped_ptr<ChromotingHostMessage> deleter(msg);
   decoder_->EndDecode();
 }
 
diff --git a/remoting/client/plugin/pepper_view.h b/remoting/client/plugin/pepper_view.h
index bb4557b..7cfa61b 100644
--- a/remoting/client/plugin/pepper_view.h
+++ b/remoting/client/plugin/pepper_view.h
@@ -44,9 +44,9 @@ class PepperView : public ChromotingView {
   virtual void UnsetSolidFill();
   virtual void SetViewport(int x, int y, int width, int height);
   virtual void SetHostScreenSize(int width, int height);
-  virtual void HandleBeginUpdateStream(HostMessage* msg);
-  virtual void HandleUpdateStreamPacket(HostMessage* msg);
-  virtual void HandleEndUpdateStream(HostMessage* msg);
+  virtual void HandleBeginUpdateStream(ChromotingHostMessage* msg);
+  virtual void HandleUpdateStreamPacket(ChromotingHostMessage* msg);
+  virtual void HandleEndUpdateStream(ChromotingHostMessage* msg);
 
  private:
   void OnPaintDone();
diff --git a/remoting/client/x11_input_handler.cc b/remoting/client/x11_input_handler.cc
index 455ff61..887862c 100644
--- a/remoting/client/x11_input_handler.cc
+++ b/remoting/client/x11_input_handler.cc
@@ -9,8 +9,8 @@
 #include "remoting/client/x11_view.h"
 #include "remoting/jingle_glue/jingle_thread.h"
 
-// Include Xlib at the end because it clashes with ClientMessage defined in
-// the protocol buffer.
+// Include Xlib at the end because it clashes with Status in
+// base/tracked_objects.h.
 #include <X11/Xlib.h>
 
 namespace remoting {
diff --git a/remoting/client/x11_view.cc b/remoting/client/x11_view.cc
index b733d93..ff51e9a 100644
--- a/remoting/client/x11_view.cc
+++ b/remoting/client/x11_view.cc
@@ -169,8 +169,8 @@ void X11View::InitPaintTarget() {
   CHECK(picture_) << "Backing picture not created";
 }
 
-void X11View::HandleBeginUpdateStream(HostMessage* msg) {
-  scoped_ptr<HostMessage> deleter(msg);
+void X11View::HandleBeginUpdateStream(ChromotingHostMessage* msg) {
+  scoped_ptr<ChromotingHostMessage> deleter(msg);
 
   // TODO(hclam): Use the information from the message to create the decoder.
   // We lazily construct the decoder.
@@ -184,12 +184,12 @@ void X11View::HandleBeginUpdateStream(HostMessage* msg) {
       NewRunnableMethod(this, &X11View::OnDecodeDone));
 }
 
-void X11View::HandleUpdateStreamPacket(HostMessage* msg) {
+void X11View::HandleUpdateStreamPacket(ChromotingHostMessage* msg) {
   decoder_->PartialDecode(msg);
 }
 
-void X11View::HandleEndUpdateStream(HostMessage* msg) {
-  scoped_ptr<HostMessage> deleter(msg);
+void X11View::HandleEndUpdateStream(ChromotingHostMessage* msg) {
+  scoped_ptr<ChromotingHostMessage> deleter(msg);
   decoder_->EndDecode();
 }
 
diff --git a/remoting/client/x11_view.h b/remoting/client/x11_view.h
index 2825575..1f1cc1c5 100644
--- a/remoting/client/x11_view.h
+++ b/remoting/client/x11_view.h
@@ -32,9 +32,9 @@ class X11View : public ChromotingView {
   virtual void UnsetSolidFill();
   virtual void SetViewport(int x, int y, int width, int height);
   virtual void SetHostScreenSize(int width, int height);
-  virtual void HandleBeginUpdateStream(HostMessage* msg);
-  virtual void HandleUpdateStreamPacket(HostMessage* msg);
-  virtual void HandleEndUpdateStream(HostMessage* msg) ;
+  virtual void HandleBeginUpdateStream(ChromotingHostMessage* msg);
+  virtual void HandleUpdateStreamPacket(ChromotingHostMessage* msg);
+  virtual void HandleEndUpdateStream(ChromotingHostMessage* msg) ;
 
   Display* display() { return display_; }