Merge 259353 "Mark drags starting in web content as tainted to a..."

ui/base/dragdrop/os_exchange_data.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 "ui/base/dragdrop/os_exchange_data.h"
 
 #include "base/pickle.h"
 #include "url/gurl.h"
 
 namespace ui {
@@ skipping 18 matching lines @@
 
 OSExchangeData::OSExchangeData() : provider_(CreateProvider()) {
 }
 
 OSExchangeData::OSExchangeData(Provider* provider) : provider_(provider) {
 }
 
 OSExchangeData::~OSExchangeData() {
 }
 
+void OSExchangeData::MarkOriginatedFromRenderer() {
+  provider_->MarkOriginatedFromRenderer();
+}
+
+bool OSExchangeData::DidOriginateFromRenderer() const {
+  return provider_->DidOriginateFromRenderer();
+}
+
 void OSExchangeData::SetString(const base::string16& data) {
   provider_->SetString(data);
 }
 
 void OSExchangeData::SetURL(const GURL& url, const base::string16& title) {
   provider_->SetURL(url, title);
 }
 
 void OSExchangeData::SetFilename(const base::FilePath& path) {
   provider_->SetFilename(path);
@@ skipping 123 matching lines @@
 void OSExchangeData::SetHtml(const base::string16& html, const GURL& base_url) {
   provider_->SetHtml(html, base_url);
 }
 
 bool OSExchangeData::GetHtml(base::string16* html, GURL* base_url) const {
   return provider_->GetHtml(html, base_url);
 }
 #endif
 
 }  // namespace ui