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

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

Issue 212693004: Merge 259353 "Mark drags starting in web content as tainted to a..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1847/src/
Patch Set: Created 6 years, 9 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 | « content/public/common/drop_data.cc ('k') | ui/base/dragdrop/gtk_dnd_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/clipboard/clipboard_aurax11.cc
===================================================================
--- ui/base/clipboard/clipboard_aurax11.cc (revision 259999)
+++ ui/base/clipboard/clipboard_aurax11.cc (working copy)
@@ -762,8 +762,11 @@
// Write an extra flavor that signifies WebKit was the last to modify the
// pasteboard. This flavor has no data.
void Clipboard::WriteWebSmartPaste() {
- aurax11_details_->InsertMapping(kMimeTypeWebkitSmartPaste,
- scoped_refptr<base::RefCountedMemory>());
+ std::string empty;
+ aurax11_details_->InsertMapping(
+ kMimeTypeWebkitSmartPaste,
+ scoped_refptr<base::RefCountedMemory>(
+ base::RefCountedString::TakeString(&empty)));
}
void Clipboard::WriteBitmap(const SkBitmap& bitmap) {
« no previous file with comments | « content/public/common/drop_data.cc ('k') | ui/base/dragdrop/gtk_dnd_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698