Moved remoting::win::MessageWindow to base::win::MessageWindow so that it could be re-used outside …

remoting/host/clipboard_win.cc

 // Copyright (c) 2012 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/clipboard.h"
 
 #include <windows.h>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/process_util.h"
 #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"
 
 namespace {
 
 // A scoper class that opens and closes the clipboard.
 // This class was adapted from the ScopedClipboard class in
 // ui/base/clipboard/clipboard_win.cc.
 class ScopedClipboard {
  public:
@@ skipping 62 matching lines @@
 };
 
 typedef BOOL (WINAPI AddClipboardFormatListenerFn)(HWND);
 typedef BOOL (WINAPI RemoveClipboardFormatListenerFn)(HWND);
 
 }  // namespace
 
 namespace remoting {
 
 class ClipboardWin : public Clipboard,
-                     public win::MessageWindow::Delegate {
+                     public base::win::MessageWindow::Delegate {
  public:
   ClipboardWin();
 
   virtual void Start(
       scoped_ptr<protocol::ClipboardStub> client_clipboard) OVERRIDE;
   virtual void InjectClipboardEvent(
       const protocol::ClipboardEvent& event) OVERRIDE;
   virtual void Stop() OVERRIDE;
 
  private:
   void OnClipboardUpdate();
 
-  // win::MessageWindow::Delegate interface.
+  // base::win::MessageWindow::Delegate interface.
   virtual bool HandleMessage(HWND hwnd,
                              UINT message,
                              WPARAM wparam,
                              LPARAM lparam,
                              LRESULT* result) OVERRIDE;
 
   scoped_ptr<protocol::ClipboardStub> client_clipboard_;
   AddClipboardFormatListenerFn* add_clipboard_format_listener_;
   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);
 };
 
 ClipboardWin::ClipboardWin()
     : add_clipboard_format_listener_(NULL),
       remove_clipboard_format_listener_(NULL) {
 }
 
 void ClipboardWin::Start(
@@ skipping 15 matching lines @@
     remove_clipboard_format_listener_ =
         reinterpret_cast<RemoveClipboardFormatListenerFn*>(
             GetProcAddress(user32, "RemoveClipboardFormatListener"));
     // If AddClipboardFormatListener() present, RemoveClipboardFormatListener()
     // should be available too.
     CHECK(remove_clipboard_format_listener_);
   } else {
     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;
   }
 
   if (add_clipboard_format_listener_) {
     if (!(*add_clipboard_format_listener_)(window_->hwnd())) {
       LOG(WARNING) << "AddClipboardFormatListener() failed: " << GetLastError();
     }
   }
@@ skipping 95 matching lines @@
   }
 
   return false;
 }
 
 scoped_ptr<Clipboard> Clipboard::Create() {
   return scoped_ptr<Clipboard>(new ClipboardWin());
 }
 
 }  // namespace remoting