summaryrefslogtreecommitdiffstats
path: root/ui/base
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-13 20:16:18 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-13 20:16:18 +0000
commitbf25948b0275199598eaa4b98aa667e0b5f9aa19 (patch)
treec9a42ab2ec57d672d95f8e20b095ebbf8eb15082 /ui/base
parent08f36f703f48c049f53232333021a4b1cc07de1a (diff)
downloadchromium_src-bf25948b0275199598eaa4b98aa667e0b5f9aa19.zip
chromium_src-bf25948b0275199598eaa4b98aa667e0b5f9aa19.tar.gz
chromium_src-bf25948b0275199598eaa4b98aa667e0b5f9aa19.tar.bz2
linux-aura: Special case text-types when pasting from clipboard.
Some apps (e.g. firefox) copies plain text content in the clipboard with selection types TEXT, STRING etc., but not text/plain (which chrome expects). So special case text content in the clipboard, and compare the type against a known number of text- types. BUG=317514 R=dcheng@chromium.org, erg@chromium.org Review URL: https://codereview.chromium.org/135593002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244569 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base')
-rw-r--r--ui/base/clipboard/clipboard_aurax11.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/base/clipboard/clipboard_aurax11.cc b/ui/base/clipboard/clipboard_aurax11.cc
index 3be15de..a5995f2 100644
--- a/ui/base/clipboard/clipboard_aurax11.cc
+++ b/ui/base/clipboard/clipboard_aurax11.cc
@@ -558,6 +558,10 @@ bool Clipboard::IsFormatAvailable(const FormatType& format,
DCHECK(IsSupportedClipboardType(type));
TargetList target_list = aurax11_details_->WaitAndGetTargetsList(type);
+ if (format.Equals(GetPlainTextFormatType()) ||
+ format.Equals(GetUrlFormatType())) {
+ return target_list.ContainsText();
+ }
return target_list.ContainsFormat(format);
}