Chromium Code Reviews| Index: remoting/host/clipboard_win.cc |
| diff --git a/remoting/host/clipboard_win.cc b/remoting/host/clipboard_win.cc |
| index dd2cc28395326d9019a2578b862dee9a8cb26d67..5e4d6b58ae8992a763faf655c9a1fcb7364239f1 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(); |
| + ~Clipboard() override; |
|
Lambros
2015/02/17 21:37:33
~ClipboardWin() ?
I didn't know C++ lets you use t
Sergey Ulanov
2015/02/17 23:51:42
Done.
|
| 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,15 @@ ClipboardWin::ClipboardWin() |
| remove_clipboard_format_listener_(nullptr) { |
| } |
| +ClipboardWin::~ClipboardWin() { |
| + client_clipboard_.reset(); |
| + |
| + if (window_ && remove_clipboard_format_listener_) |
| + (*remove_clipboard_format_listener_)(window_->hwnd()); |
| + |
| + window_.reset(); |
|
Lambros
2015/02/17 21:37:33
Don't need this line?
Sergey Ulanov
2015/02/17 23:51:42
Done.
|
| +} |
| + |
| void ClipboardWin::Start( |
| scoped_ptr<protocol::ClipboardStub> client_clipboard) { |
| DCHECK(!add_clipboard_format_listener_); |
| @@ -179,15 +188,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_) |