Move move classes to the remoting::protocol namespace. Minor cleanups.

remoting/host/event_executor_win.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/host/event_executor_win.h"
 
 #include <windows.h>
 
 #include "app/keyboard_codes.h"
 #include "base/message_loop.h"
 #include "base/stl_util-inl.h"
 #include "remoting/host/capturer.h"
 #include "remoting/proto/event.pb.h"
 
 namespace remoting {
 
+using protocol::MouseEvent;
+using protocol::KeyEvent;
+
 EventExecutorWin::EventExecutorWin(
     MessageLoop* message_loop, Capturer* capturer)
     : message_loop_(message_loop),
       capturer_(capturer) {
 }
 
 EventExecutorWin::~EventExecutorWin() {
 }
 
 void EventExecutorWin::InjectKeyEvent(const KeyEvent* event, Task* done) {
   if (MessageLoop::current() != message_loop_) {
     message_loop_->PostTask(
         FROM_HERE,
         NewRunnableMethod(this, &EventExecutorWin::InjectKeyEvent,
                           event, done));
     return;
   }
   HandleKey(event);
   done->Run();
   delete done;
 }
 
-void EventExecutorWin::InjectMouseEvent(const MouseEvent* event,
-                                        Task* done) {
+void EventExecutorWin::InjectMouseEvent(const MouseEvent* event, Task* done) {
   if (MessageLoop::current() != message_loop_) {
     message_loop_->PostTask(
         FROM_HERE,
         NewRunnableMethod(this, &EventExecutorWin::InjectMouseEvent,
                           event, done));
     return;
   }
   HandleMouse(event);
   done->Run();
   delete done;
@@ skipping 68 matching lines @@
     }
   }
 
   if (event->has_button() && event->has_button_down()) {
     INPUT button_event;
     button_event.type = INPUT_MOUSE;
     button_event.mi.time = 0;
     button_event.mi.dx = 0;
     button_event.mi.dy = 0;
 
-    MouseButton button = event->button();
+    MouseEvent::MouseButton button = event->button();
     bool down = event->button_down();
-    if (button == MouseButtonLeft) {
+    if (button == MouseEvent::BUTTON_LEFT) {
       button_event.mi.dwFlags =
           down ? MOUSEEVENTF_LEFTDOWN : MOUSEEVENTF_LEFTUP;
-    } else if (button == MouseButtonMiddle) {
+    } else if (button == MouseEvent::BUTTON_MIDDLE) {
       button_event.mi.dwFlags =
           down ? MOUSEEVENTF_MIDDLEDOWN : MOUSEEVENTF_MIDDLEUP;
-    } else if (button == MouseButtonRight) {
+    } else if (button == MouseEvent::BUTTON_RIGHT) {
       button_event.mi.dwFlags =
           down ? MOUSEEVENTF_RIGHTDOWN : MOUSEEVENTF_RIGHTUP;
     } else {
       button_event.mi.dwFlags =
           down ? MOUSEEVENTF_LEFTDOWN : MOUSEEVENTF_LEFTUP;
     }
 
     SendInput(1, &button_event, sizeof(INPUT));
   }
 }
 
 }  // namespace remoting