| Index: remoting/host/clipboard_x11.cc
|
| diff --git a/remoting/host/clipboard_x11.cc b/remoting/host/clipboard_x11.cc
|
| index dc0bd988c5924cd4fda404f4a5559e46368de82d..667d260804521dcf7fac48e1bfb41634034e1750 100644
|
| --- a/remoting/host/clipboard_x11.cc
|
| +++ b/remoting/host/clipboard_x11.cc
|
| @@ -25,7 +25,6 @@ class ClipboardX11 : public Clipboard,
|
| // Clipboard interface.
|
| void Start(scoped_ptr<protocol::ClipboardStub> client_clipboard) override;
|
| void InjectClipboardEvent(const protocol::ClipboardEvent& event) override;
|
| - void Stop() override;
|
|
|
| // MessageLoopForIO::Watcher interface.
|
| void OnFileCanReadWithoutBlocking(int fd) override;
|
| @@ -56,7 +55,8 @@ ClipboardX11::ClipboardX11()
|
| }
|
|
|
| ClipboardX11::~ClipboardX11() {
|
| - Stop();
|
| + if (display_)
|
| + XCloseDisplay(display_);
|
| }
|
|
|
| void ClipboardX11::Start(
|
| @@ -87,16 +87,6 @@ void ClipboardX11::InjectClipboardEvent(
|
| x_server_clipboard_.SetClipboard(event.mime_type(), event.data());
|
| }
|
|
|
| -void ClipboardX11::Stop() {
|
| - client_clipboard_.reset();
|
| - x_connection_watcher_.StopWatchingFileDescriptor();
|
| -
|
| - if (display_) {
|
| - XCloseDisplay(display_);
|
| - display_ = nullptr;
|
| - }
|
| -}
|
| -
|
| void ClipboardX11::OnFileCanReadWithoutBlocking(int fd) {
|
| PumpXEvents();
|
| }
|
|
|