| commit | e2123b52e9189ad48d77fe67a41357f04d0c0bf2 | [log] [tgz] |
|---|---|---|
| author | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Sat Nov 17 14:19:49 2012 |
| committer | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Sat Nov 17 14:19:49 2012 |
| tree | b05bc8965d5d4f7655010b43b7aba01999b7f314 | |
| parent | d3715c77f11566937b964aaf127d2aea974d3666 [diff] [blame] |
Linux clipboard support for Chromoting host. Submission for readability review. Original CLs: http://codereview.chromium.org/10909133 http://codereview.chromium.org/11035049 Review URL: https://chromiumcodereview.appspot.com/11340028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168428 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/remoting/host/clipboard_linux.cc b/remoting/host/clipboard_linux.cc index 1f74689..30b53916 100644 --- a/remoting/host/clipboard_linux.cc +++ b/remoting/host/clipboard_linux.cc
@@ -40,9 +40,14 @@ scoped_ptr<protocol::ClipboardStub> client_clipboard_; + // Underlying X11 clipboard implementation. XServerClipboard x_server_clipboard_; + + // Connection to the X server, used by |x_server_clipboard_|. This is created + // and owned by this class. Display* display_; + // Watcher used to handle X11 events from |display_|. MessageLoopForIO::FileDescriptorWatcher x_connection_watcher_; DISALLOW_COPY_AND_ASSIGN(ClipboardLinux);