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

Unified Diff: ui/base/clipboard/scoped_clipboard_writer.cc

Issue 558913003: Remove clipboard argument from ScopedClipboardWriter constructor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Don't leak a clipboard on Windows Created 6 years, 3 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 | « ui/base/clipboard/scoped_clipboard_writer.h ('k') | ui/views/controls/message_box_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/clipboard/scoped_clipboard_writer.cc
diff --git a/ui/base/clipboard/scoped_clipboard_writer.cc b/ui/base/clipboard/scoped_clipboard_writer.cc
index 380b8d2fb848bdb9f012ed0595df1371124e449b..50a7ba39fec8544eec497a55c851387c578a3909 100644
--- a/ui/base/clipboard/scoped_clipboard_writer.cc
+++ b/ui/base/clipboard/scoped_clipboard_writer.cc
@@ -15,15 +15,12 @@
namespace ui {
-ScopedClipboardWriter::ScopedClipboardWriter(Clipboard* clipboard,
- ClipboardType type)
- : clipboard_(clipboard),
- type_(type) {
+ScopedClipboardWriter::ScopedClipboardWriter(ClipboardType type) : type_(type) {
}
ScopedClipboardWriter::~ScopedClipboardWriter() {
- if (!objects_.empty() && clipboard_)
- clipboard_->WriteObjects(type_, objects_);
+ if (!objects_.empty())
+ ui::Clipboard::GetForCurrentThread()->WriteObjects(type_, objects_);
}
void ScopedClipboardWriter::WriteText(const base::string16& text) {
« no previous file with comments | « ui/base/clipboard/scoped_clipboard_writer.h ('k') | ui/views/controls/message_box_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698