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

ui/base/dragdrop/os_exchange_data_provider_aura.h

 // 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.
 
 #ifndef UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_PROVIDER_AURA_H_
 #define UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_PROVIDER_AURA_H_
 
 #include <map>
 
 #include "base/files/file_path.h"
 #include "base/pickle.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/vector2d.h"
 #include "url/gurl.h"
 
 namespace ui {
 
 class Clipboard;
 
 // OSExchangeData::Provider implementation for aura on linux.
 class UI_BASE_EXPORT OSExchangeDataProviderAura
     : public OSExchangeData::Provider {
  public:
   OSExchangeDataProviderAura();
   virtual ~OSExchangeDataProviderAura();
 
   // Overridden from OSExchangeData::Provider:
   virtual Provider* Clone() const OVERRIDE;
+  virtual void MarkOriginatedFromRenderer() OVERRIDE;
+  virtual bool DidOriginateFromRenderer() const OVERRIDE;
   virtual void SetString(const base::string16& data) OVERRIDE;
   virtual void SetURL(const GURL& url, const base::string16& title) OVERRIDE;
   virtual void SetFilename(const base::FilePath& path) OVERRIDE;
   virtual void SetFilenames(
       const std::vector<OSExchangeData::FileInfo>& filenames) OVERRIDE;
   virtual void SetPickledData(const OSExchangeData::CustomFormat& format,
                               const Pickle& data) OVERRIDE;
   virtual bool GetString(base::string16* data) const OVERRIDE;
   virtual bool GetURLAndTitle(OSExchangeData::FilenameToURLPolicy policy,
                               GURL* url,
@@ skipping 49 matching lines @@
   // For HTML format
   base::string16 html_;
   GURL base_url_;
 
   DISALLOW_COPY_AND_ASSIGN(OSExchangeDataProviderAura);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_PROVIDER_AURA_H_