Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(594)

Unified Diff: remoting/host/clipboard_win.cc

Issue 930403002: Remove remoting::Clipboard::Stop(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/clipboard_mac.mm ('k') | remoting/host/clipboard_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_)
« no previous file with comments | « remoting/host/clipboard_mac.mm ('k') | remoting/host/clipboard_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698