OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "remoting/host/clipboard.h" | 5 #include "remoting/host/clipboard.h" |
6 | 6 |
7 #include <X11/Xlib.h> | 7 #include <X11/Xlib.h> |
8 #undef Status // Xlib.h #defines this, which breaks protobuf headers. | 8 #undef Status // Xlib.h #defines this, which breaks protobuf headers. |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/macros.h" |
12 #include "base/message_loop/message_loop.h" | 13 #include "base/message_loop/message_loop.h" |
13 #include "remoting/host/linux/x_server_clipboard.h" | 14 #include "remoting/host/linux/x_server_clipboard.h" |
14 #include "remoting/proto/event.pb.h" | 15 #include "remoting/proto/event.pb.h" |
15 #include "remoting/protocol/clipboard_stub.h" | 16 #include "remoting/protocol/clipboard_stub.h" |
16 | 17 |
17 namespace remoting { | 18 namespace remoting { |
18 | 19 |
19 // This code is expected to be called on the desktop thread only. | 20 // This code is expected to be called on the desktop thread only. |
20 class ClipboardX11 : public Clipboard, | 21 class ClipboardX11 : public Clipboard, |
21 public base::MessageLoopForIO::Watcher { | 22 public base::MessageLoopForIO::Watcher { |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
114 XNextEvent(display_, &event); | 115 XNextEvent(display_, &event); |
115 x_server_clipboard_.ProcessXEvent(&event); | 116 x_server_clipboard_.ProcessXEvent(&event); |
116 } | 117 } |
117 } | 118 } |
118 | 119 |
119 scoped_ptr<Clipboard> Clipboard::Create() { | 120 scoped_ptr<Clipboard> Clipboard::Create() { |
120 return make_scoped_ptr(new ClipboardX11()); | 121 return make_scoped_ptr(new ClipboardX11()); |
121 } | 122 } |
122 | 123 |
123 } // namespace remoting | 124 } // namespace remoting |
OLD | NEW |