Index: remoting/host/clipboard_win.cc |
diff --git a/remoting/host/clipboard_win.cc b/remoting/host/clipboard_win.cc |
index 60f9ce1d103c92a9e3c4a9bc8c6b933a81d08ce6..4c4165ddb7534357f066d6bf8eae0bb9600b9090 100644 |
--- a/remoting/host/clipboard_win.cc |
+++ b/remoting/host/clipboard_win.cc |
@@ -13,12 +13,12 @@ |
#include "base/strings/string16.h" |
#include "base/strings/utf_string_conversions.h" |
#include "base/threading/platform_thread.h" |
+#include "base/win/message_window.h" |
#include "base/win/scoped_hglobal.h" |
#include "base/win/windows_version.h" |
#include "base/win/wrapped_window_proc.h" |
#include "remoting/base/constants.h" |
#include "remoting/base/util.h" |
-#include "remoting/host/win/message_window.h" |
#include "remoting/proto/event.pb.h" |
#include "remoting/protocol/clipboard_stub.h" |
@@ -101,7 +101,7 @@ typedef BOOL (WINAPI RemoveClipboardFormatListenerFn)(HWND); |
namespace remoting { |
class ClipboardWin : public Clipboard, |
- public win::MessageWindow::Delegate { |
+ public base::win::MessageWindow::Delegate { |
public: |
ClipboardWin(); |
@@ -114,7 +114,7 @@ class ClipboardWin : public Clipboard, |
private: |
void OnClipboardUpdate(); |
- // win::MessageWindow::Delegate interface. |
+ // base::win::MessageWindow::Delegate interface. |
virtual bool HandleMessage(HWND hwnd, |
UINT message, |
WPARAM wparam, |
@@ -126,7 +126,7 @@ class ClipboardWin : public Clipboard, |
RemoveClipboardFormatListenerFn* remove_clipboard_format_listener_; |
// Used to subscribe to WM_CLIPBOARDUPDATE messages. |
- scoped_ptr<win::MessageWindow> window_; |
+ scoped_ptr<base::win::MessageWindow> window_; |
DISALLOW_COPY_AND_ASSIGN(ClipboardWin); |
}; |
@@ -162,8 +162,8 @@ void ClipboardWin::Start( |
LOG(WARNING) << "AddClipboardFormatListener() is not available."; |
} |
- window_.reset(new win::MessageWindow()); |
- if (!window_->Create(this)) { |
+ window_.reset(new base::win::MessageWindow()); |
+ if (!window_->Create(this, NULL)) { |
LOG(ERROR) << "Couldn't create clipboard window."; |
window_.reset(); |
return; |