Revert 57112 - Rename (Host|Client)Message to Chromoting(Host|Client)Message....

remoting/client/x11_view.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/client/x11_view.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/Xrender.h>
 #include <X11/extensions/Xcomposite.h>
@@ skipping 151 matching lines @@
 
   XRenderPictFormat* pictformat = XRenderFindVisualFormat(
       display_,
       attr.visual);
   CHECK(pictformat) << "XRENDER does not support default visual";
 
   picture_ = XRenderCreatePicture(display_, window_, pictformat, 0, NULL);
   CHECK(picture_) << "Backing picture not created";
 }
 
-void X11View::HandleBeginUpdateStream(ChromotingHostMessage* msg) {
-  scoped_ptr<ChromotingHostMessage> deleter(msg);
+void X11View::HandleBeginUpdateStream(HostMessage* msg) {
+  scoped_ptr<HostMessage> deleter(msg);
 
   // TODO(hclam): Use the information from the message to create the decoder.
   // We lazily construct the decoder.
   if (!decoder_.get()) {
     decoder_.reset(new DecoderZlib());
   }
 
   // Tell the decoder to do start decoding.
   decoder_->BeginDecode(frame_, &update_rects_,
       NewRunnableMethod(this, &X11View::OnPartialDecodeDone),
       NewRunnableMethod(this, &X11View::OnDecodeDone));
 }
 
-void X11View::HandleUpdateStreamPacket(ChromotingHostMessage* msg) {
+void X11View::HandleUpdateStreamPacket(HostMessage* msg) {
   decoder_->PartialDecode(msg);
 }
 
-void X11View::HandleEndUpdateStream(ChromotingHostMessage* msg) {
-  scoped_ptr<ChromotingHostMessage> deleter(msg);
+void X11View::HandleEndUpdateStream(HostMessage* msg) {
+  scoped_ptr<HostMessage> deleter(msg);
   decoder_->EndDecode();
 }
 
 void X11View::OnPartialDecodeDone() {
   // Decoder has produced some output so schedule a paint. We'll get a Paint()
   // call in the near future. Note that we can get UpdateStreamPacket during
   // this short period of time and we will perform decode again and the
   // information in updated rects will be lost.
   // There are several ways to solve this problem.
   // 1. Merge the updated rects and perform one paint.
@@ skipping 11 matching lines @@
   XEvent event;
   event.type = Expose;
   XSendEvent(display_, static_cast<int>(window_), true, ExposureMask, &event);
 }
 
 void X11View::OnDecodeDone() {
   // Since we do synchronous decoding here there's nothing in this method.
 }
 
 }  // namespace remoting