Remove remoting::Clipboard::Stop().

remoting/host/clipboard_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/host/clipboard.h"
 
 #include <windows.h>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 89 matching lines @@
 typedef BOOL (WINAPI AddClipboardFormatListenerFn)(HWND);
 typedef BOOL (WINAPI RemoveClipboardFormatListenerFn)(HWND);
 
 }  // namespace
 
 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 the base class name for the dtor :)

[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();
 
   // Handles messages received by |window_|.
   bool HandleMessage(UINT message,
                      WPARAM wparam,
                      LPARAM lparam,
                      LRESULT* result);
 
   scoped_ptr<protocol::ClipboardStub> client_clipboard_;
   AddClipboardFormatListenerFn* add_clipboard_format_listener_;
   RemoveClipboardFormatListenerFn* remove_clipboard_format_listener_;
 
   // Used to subscribe to WM_CLIPBOARDUPDATE messages.
   scoped_ptr<base::win::MessageWindow> window_;
 
   DISALLOW_COPY_AND_ASSIGN(ClipboardWin);
 };
 
 ClipboardWin::ClipboardWin()
     : add_clipboard_format_listener_(nullptr),
       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_);
   DCHECK(!remove_clipboard_format_listener_);
   DCHECK(!window_);
 
   client_clipboard_.swap(client_clipboard);
 
   // user32.dll is statically linked.
   HMODULE user32 = GetModuleHandle(L"user32.dll");
@@ skipping 21 matching lines @@
     return;
   }
 
   if (add_clipboard_format_listener_) {
     if (!(*add_clipboard_format_listener_)(window_->hwnd())) {
       LOG(WARNING) << "AddClipboardFormatListener() failed: " << GetLastError();
     }
   }
 }
 
-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_)
     return;
 
   // Currently we only handle UTF-8 text.
   if (event.mime_type().compare(kMimeTypeTextUtf8) != 0)
     return;
   if (!StringIsUtf8(event.data().c_str(), event.data().length())) {
     LOG(ERROR) << "ClipboardEvent: data is not UTF-8 encoded.";
@@ skipping 74 matching lines @@
   }
 
   return false;
 }
 
 scoped_ptr<Clipboard> Clipboard::Create() {
   return make_scoped_ptr(new ClipboardWin());
 }
 
 }  // namespace remoting