diff options
author | rbyers@chromium.org <rbyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-20 18:16:11 +0000 |
---|---|---|
committer | rbyers@chromium.org <rbyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-20 18:16:11 +0000 |
commit | 71322cdddf53036a52e872e84e5a61c9e619fced (patch) | |
tree | f4c37ffc0acf9b14d68fc4ca89e26bf744deaf5b /ui/base | |
parent | becdaa3de361d84f94b24b623d2cb975efa7ce47 (diff) | |
download | chromium_src-71322cdddf53036a52e872e84e5a61c9e619fced.zip chromium_src-71322cdddf53036a52e872e84e5a61c9e619fced.tar.gz chromium_src-71322cdddf53036a52e872e84e5a61c9e619fced.tar.bz2 |
Don't clobber the clipboard when doing DnD on Aura
BUG=118835
TEST=Do paste after DnD of text, verify original clipboard contents unmodified
Review URL: https://chromiumcodereview.appspot.com/9726001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127722 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base')
-rw-r--r-- | ui/base/dragdrop/os_exchange_data_provider_aura.cc | 16 | ||||
-rw-r--r-- | ui/base/dragdrop/os_exchange_data_provider_aura.h | 3 |
2 files changed, 0 insertions, 19 deletions
diff --git a/ui/base/dragdrop/os_exchange_data_provider_aura.cc b/ui/base/dragdrop/os_exchange_data_provider_aura.cc index 238cb47..0d3a122 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_aura.cc +++ b/ui/base/dragdrop/os_exchange_data_provider_aura.cc @@ -7,7 +7,6 @@ #include "base/logging.h" #include "base/utf_string_conversions.h" #include "net/base/net_util.h" -#include "ui/base/clipboard/scoped_clipboard_writer.h" namespace ui { @@ -15,21 +14,6 @@ OSExchangeDataProviderAura::OSExchangeDataProviderAura() : formats_(0) {} OSExchangeDataProviderAura::~OSExchangeDataProviderAura() {} -void OSExchangeDataProviderAura::WriteDataToClipboard( - Clipboard* clipboard) const { - ScopedClipboardWriter scw(clipboard, Clipboard::BUFFER_STANDARD); - if (HasString()) - scw.WriteText(string_); - if (HasURL()) - scw.WriteHyperlink(title_, url_.spec()); - if (HasFile()) { - Pickle filename_pickle; - filename_pickle.WriteString(net::FilePathToFileURL(filename_).spec()); - scw.WritePickledData(filename_pickle, Clipboard::GetFilenameFormatType()); - } - // TODO(varunjain): support pickle format. -} - void OSExchangeDataProviderAura::SetString(const string16& data) { string_ = data; formats_ |= OSExchangeData::STRING; diff --git a/ui/base/dragdrop/os_exchange_data_provider_aura.h b/ui/base/dragdrop/os_exchange_data_provider_aura.h index 0e0dfe4..ab7c5f3 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_aura.h +++ b/ui/base/dragdrop/os_exchange_data_provider_aura.h @@ -24,9 +24,6 @@ class UI_EXPORT OSExchangeDataProviderAura : public OSExchangeData::Provider { OSExchangeDataProviderAura(); virtual ~OSExchangeDataProviderAura(); - // Writes interchange data on to the |clipboard|. - void WriteDataToClipboard(Clipboard* clipboard) const; - // Overridden from OSExchangeData::Provider: virtual void SetString(const string16& data) OVERRIDE; virtual void SetURL(const GURL& url, const string16& title) OVERRIDE; |