diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-29 17:45:12 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-29 17:45:12 +0000 |
| commit | c9c94badff01963c313e77604ee838254e11240f (patch) | |
| tree | b9ed6bd582b7ea4124741fe1011f4237f6659643 /remoting | |
| parent | 49e293a1ac5d94c0cbac0b49acb85a22dfea6c20 (diff) | |
| download | chromium_src-c9c94badff01963c313e77604ee838254e11240f.zip chromium_src-c9c94badff01963c313e77604ee838254e11240f.tar.gz chromium_src-c9c94badff01963c313e77604ee838254e11240f.tar.bz2 | |
Rationalize linux vs x11 in remoting
BUG=236170
TEST=None
R=ben@chromium.org
Review URL: https://codereview.chromium.org/14104006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197073 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/clipboard_x11.cc (renamed from remoting/host/clipboard_linux.cc) | 34 | ||||
| -rw-r--r-- | remoting/remoting.gyp | 2 |
2 files changed, 18 insertions, 18 deletions
diff --git a/remoting/host/clipboard_linux.cc b/remoting/host/clipboard_x11.cc index e436859..eb952c1 100644 --- a/remoting/host/clipboard_linux.cc +++ b/remoting/host/clipboard_x11.cc @@ -16,11 +16,11 @@ namespace remoting { // This code is expected to be called on the desktop thread only. -class ClipboardLinux : public Clipboard, - public MessageLoopForIO::Watcher { +class ClipboardX11 : public Clipboard, + public MessageLoopForIO::Watcher { public: - ClipboardLinux(); - virtual ~ClipboardLinux(); + ClipboardX11(); + virtual ~ClipboardX11(); // Clipboard interface. virtual void Start( @@ -50,18 +50,18 @@ class ClipboardLinux : public Clipboard, // Watcher used to handle X11 events from |display_|. MessageLoopForIO::FileDescriptorWatcher x_connection_watcher_; - DISALLOW_COPY_AND_ASSIGN(ClipboardLinux); + DISALLOW_COPY_AND_ASSIGN(ClipboardX11); }; -ClipboardLinux::ClipboardLinux() +ClipboardX11::ClipboardX11() : display_(NULL) { } -ClipboardLinux::~ClipboardLinux() { +ClipboardX11::~ClipboardX11() { Stop(); } -void ClipboardLinux::Start( +void ClipboardX11::Start( scoped_ptr<protocol::ClipboardStub> client_clipboard) { // TODO(lambroslambrou): Share the X connection with InputInjector. display_ = XOpenDisplay(NULL); @@ -72,7 +72,7 @@ void ClipboardLinux::Start( client_clipboard_.swap(client_clipboard); x_server_clipboard_.Init(display_, - base::Bind(&ClipboardLinux::OnClipboardChanged, + base::Bind(&ClipboardX11::OnClipboardChanged, base::Unretained(this))); MessageLoopForIO::current()->WatchFileDescriptor( @@ -81,12 +81,12 @@ void ClipboardLinux::Start( PumpXEvents(); } -void ClipboardLinux::InjectClipboardEvent( +void ClipboardX11::InjectClipboardEvent( const protocol::ClipboardEvent& event) { x_server_clipboard_.SetClipboard(event.mime_type(), event.data()); } -void ClipboardLinux::Stop() { +void ClipboardX11::Stop() { client_clipboard_.reset(); x_connection_watcher_.StopWatchingFileDescriptor(); @@ -96,15 +96,15 @@ void ClipboardLinux::Stop() { } } -void ClipboardLinux::OnFileCanReadWithoutBlocking(int fd) { +void ClipboardX11::OnFileCanReadWithoutBlocking(int fd) { PumpXEvents(); } -void ClipboardLinux::OnFileCanWriteWithoutBlocking(int fd) { +void ClipboardX11::OnFileCanWriteWithoutBlocking(int fd) { } -void ClipboardLinux::OnClipboardChanged(const std::string& mime_type, - const std::string& data) { +void ClipboardX11::OnClipboardChanged(const std::string& mime_type, + const std::string& data) { protocol::ClipboardEvent event; event.set_mime_type(mime_type); event.set_data(data); @@ -114,7 +114,7 @@ void ClipboardLinux::OnClipboardChanged(const std::string& mime_type, } } -void ClipboardLinux::PumpXEvents() { +void ClipboardX11::PumpXEvents() { DCHECK(display_); while (XPending(display_)) { @@ -125,7 +125,7 @@ void ClipboardLinux::PumpXEvents() { } scoped_ptr<Clipboard> Clipboard::Create() { - return scoped_ptr<Clipboard>(new ClipboardLinux()); + return scoped_ptr<Clipboard>(new ClipboardX11()); } } // namespace remoting diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index b21c52d..c43a838 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -330,9 +330,9 @@ 'host/client_session.h', 'host/client_session_control.h', 'host/clipboard.h', - 'host/clipboard_linux.cc', 'host/clipboard_mac.mm', 'host/clipboard_win.cc', + 'host/clipboard_x11.cc', 'host/config_file_watcher.cc', 'host/config_file_watcher.h', 'host/constants_mac.cc', |