| Index: remoting/host/local_input_monitor_win.cc
|
| diff --git a/remoting/host/local_input_monitor_win.cc b/remoting/host/local_input_monitor_win.cc
|
| index 347513ffeadc40a04424c0b6af28ab1c1b6bfda5..d50d6057cf11a885f7c506d6018d548fc7cb45f0 100644
|
| --- a/remoting/host/local_input_monitor_win.cc
|
| +++ b/remoting/host/local_input_monitor_win.cc
|
| @@ -11,8 +11,8 @@
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "base/threading/non_thread_safe.h"
|
| +#include "base/win/message_window.h"
|
| #include "remoting/host/client_session_control.h"
|
| -#include "remoting/host/win/message_window.h"
|
| #include "third_party/skia/include/core/SkPoint.h"
|
|
|
| namespace remoting {
|
| @@ -37,7 +37,7 @@ class LocalInputMonitorWin : public base::NonThreadSafe,
|
| private:
|
| // The actual implementation resides in LocalInputMonitorWin::Core class.
|
| class Core : public base::RefCountedThreadSafe<Core>,
|
| - public win::MessageWindow::Delegate {
|
| + public base::win::MessageWindow::Delegate {
|
| public:
|
| Core(scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
|
| scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
|
| @@ -56,7 +56,7 @@ class LocalInputMonitorWin : public base::NonThreadSafe,
|
| // Handles WM_INPUT messages.
|
| LRESULT OnInput(HRAWINPUT input_handle);
|
|
|
| - // win::MessageWindow::Delegate interface.
|
| + // base::win::MessageWindow::Delegate interface.
|
| virtual bool HandleMessage(HWND hwnd,
|
| UINT message,
|
| WPARAM wparam,
|
| @@ -70,7 +70,7 @@ class LocalInputMonitorWin : public base::NonThreadSafe,
|
| scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
|
|
|
| // Used to receive raw input.
|
| - scoped_ptr<win::MessageWindow> window_;
|
| + scoped_ptr<base::win::MessageWindow> window_;
|
|
|
| // Points to the object receiving mouse event notifications.
|
| base::WeakPtr<ClientSessionControl> client_session_control_;
|
| @@ -127,8 +127,8 @@ LocalInputMonitorWin::Core::~Core() {
|
| void LocalInputMonitorWin::Core::StartOnUiThread() {
|
| DCHECK(ui_task_runner_->BelongsToCurrentThread());
|
|
|
| - window_.reset(new win::MessageWindow());
|
| - if (!window_->Create(this)) {
|
| + window_.reset(new base::win::MessageWindow());
|
| + if (!window_->Create(this, NULL)) {
|
| LOG_GETLASTERROR(ERROR) << "Failed to create the raw input window";
|
| window_.reset();
|
|
|
|
|