| Index: remoting/host/clipboard_win.cc
|
| diff --git a/remoting/host/clipboard_win.cc b/remoting/host/clipboard_win.cc
|
| index dd2cc28395326d9019a2578b862dee9a8cb26d67..7c25ec2ef8af0752c6118111177848de3482d369 100644
|
| --- a/remoting/host/clipboard_win.cc
|
| +++ b/remoting/host/clipboard_win.cc
|
| @@ -107,12 +107,12 @@ namespace remoting {
|
| class ClipboardWin : public Clipboard {
|
| public:
|
| ClipboardWin();
|
| + ~ClipboardWin() override;
|
|
|
| virtual void Start(
|
| scoped_ptr<protocol::ClipboardStub> client_clipboard) override;
|
| virtual void InjectClipboardEvent(
|
| const protocol::ClipboardEvent& event) override;
|
| - virtual void Stop() override;
|
|
|
| private:
|
| void OnClipboardUpdate();
|
| @@ -138,6 +138,11 @@ ClipboardWin::ClipboardWin()
|
| remove_clipboard_format_listener_(nullptr) {
|
| }
|
|
|
| +ClipboardWin::~ClipboardWin() {
|
| + if (window_ && remove_clipboard_format_listener_)
|
| + (*remove_clipboard_format_listener_)(window_->hwnd());
|
| +}
|
| +
|
| void ClipboardWin::Start(
|
| scoped_ptr<protocol::ClipboardStub> client_clipboard) {
|
| DCHECK(!add_clipboard_format_listener_);
|
| @@ -179,15 +184,6 @@ void ClipboardWin::Start(
|
| }
|
| }
|
|
|
| -void ClipboardWin::Stop() {
|
| - client_clipboard_.reset();
|
| -
|
| - if (window_ && remove_clipboard_format_listener_)
|
| - (*remove_clipboard_format_listener_)(window_->hwnd());
|
| -
|
| - window_.reset();
|
| -}
|
| -
|
| void ClipboardWin::InjectClipboardEvent(
|
| const protocol::ClipboardEvent& event) {
|
| if (!window_)
|
|
|