| Index: remoting/host/clipboard_linux.cc
|
| diff --git a/remoting/host/clipboard_linux.cc b/remoting/host/clipboard_linux.cc
|
| index e436859e0942de0349064709e5d4514a23a354e9..9fd3a27b9c5d53a31f798ba54842d45eb7199041 100644
|
| --- a/remoting/host/clipboard_linux.cc
|
| +++ b/remoting/host/clipboard_linux.cc
|
| @@ -17,7 +17,7 @@ namespace remoting {
|
|
|
| // This code is expected to be called on the desktop thread only.
|
| class ClipboardLinux : public Clipboard,
|
| - public MessageLoopForIO::Watcher {
|
| + public base::MessageLoopForIO::Watcher {
|
| public:
|
| ClipboardLinux();
|
| virtual ~ClipboardLinux();
|
| @@ -48,7 +48,7 @@ class ClipboardLinux : public Clipboard,
|
| Display* display_;
|
|
|
| // Watcher used to handle X11 events from |display_|.
|
| - MessageLoopForIO::FileDescriptorWatcher x_connection_watcher_;
|
| + base::MessageLoopForIO::FileDescriptorWatcher x_connection_watcher_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ClipboardLinux);
|
| };
|
| @@ -75,9 +75,12 @@ void ClipboardLinux::Start(
|
| base::Bind(&ClipboardLinux::OnClipboardChanged,
|
| base::Unretained(this)));
|
|
|
| - MessageLoopForIO::current()->WatchFileDescriptor(
|
| - ConnectionNumber(display_), true, MessageLoopForIO::WATCH_READ,
|
| - &x_connection_watcher_, this);
|
| + base::MessageLoopForIO::current()->WatchFileDescriptor(
|
| + ConnectionNumber(display_),
|
| + true,
|
| + base::MessageLoopForIO::WATCH_READ,
|
| + &x_connection_watcher_,
|
| + this);
|
| PumpXEvents();
|
| }
|
|
|
|
|