diff options
| author | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-08 02:45:13 +0000 |
|---|---|---|
| committer | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-08 02:45:13 +0000 |
| commit | d3ecc939b68dbb3ee922d2fd04d89230c7b62733 (patch) | |
| tree | b2749f839f1faa2e70cadb17569904a794813bbf /ui | |
| parent | 4f3e6301fdcac711b6327c1a87e24b417397c2ff (diff) | |
| download | chromium_src-d3ecc939b68dbb3ee922d2fd04d89230c7b62733.zip chromium_src-d3ecc939b68dbb3ee922d2fd04d89230c7b62733.tar.gz chromium_src-d3ecc939b68dbb3ee922d2fd04d89230c7b62733.tar.bz2 | |
aura: small fix to clipboard logic for reading custom data.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/9350031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120922 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/clipboard/clipboard_aurax11.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/ui/base/clipboard/clipboard_aurax11.cc b/ui/base/clipboard/clipboard_aurax11.cc index 4760aff..ee3975d 100644 --- a/ui/base/clipboard/clipboard_aurax11.cc +++ b/ui/base/clipboard/clipboard_aurax11.cc @@ -261,12 +261,11 @@ class AuraClipboard { void ReadCustomData(const string16& type, string16* result) const { result->clear(); const ClipboardData* data = GetData(); - if (!HasFormat(CUSTOM) || - type != UTF8ToUTF16(data->custom_data_format())) + if (!HasFormat(CUSTOM)) return; - *result = UTF8ToUTF16(std::string(data->custom_data_data(), - data->custom_data_len())); + ui::ReadCustomDataForType(data->custom_data_data(), data->custom_data_len(), + type, result); } // Reads bookmark from the data at the top of clipboard stack. @@ -505,6 +504,12 @@ void Clipboard::ReadAvailableTypes(Buffer buffer, std::vector<string16>* types, } if (IsFormatAvailable(GetBitmapFormatType(), buffer)) types->push_back(UTF8ToUTF16(GetBitmapFormatType().ToString())); + + AuraClipboard* clipboard = GetClipboard(); + if (clipboard->IsFormatAvailable(CUSTOM) && clipboard->GetData()) { + ui::ReadCustomDataTypes(clipboard->GetData()->custom_data_data(), + clipboard->GetData()->custom_data_len(), types); + } } void Clipboard::ReadText(Buffer buffer, string16* result) const { |