diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-04 17:05:03 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-04 17:05:03 +0000 |
| commit | 116da0e8d6e9028bc2cafe943e9dd24b7bf7c862 (patch) | |
| tree | 61fd3e8a4bf1a9947c601aa663b5a77030f8f7ab /ui/base/clipboard | |
| parent | 98756e2372dab700cb87b1ba5973b8df0940d0ef (diff) | |
| download | chromium_src-116da0e8d6e9028bc2cafe943e9dd24b7bf7c862.zip chromium_src-116da0e8d6e9028bc2cafe943e9dd24b7bf7c862.tar.gz chromium_src-116da0e8d6e9028bc2cafe943e9dd24b7bf7c862.tar.bz2 | |
Make Chrome's clipboard compatible with the clipboard for mono apps (http://www.mono-project.com/)
A request for the "TARGETS" target of the clipboard selection via
XConvertSelection(display, selection, target, property, requestor, time)
should set |property| to a property of type XA_ATOM. Mono apps set |property| to a property of type "TARGETS" instead.
This CL treats a property of type "TARGETS" the same as a property of type XA_ATOM.
BUG=377893
TEST=Manual, see bug
Review URL: https://codereview.chromium.org/314943002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274851 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/clipboard')
| -rw-r--r-- | ui/base/clipboard/clipboard_aurax11.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/base/clipboard/clipboard_aurax11.cc b/ui/base/clipboard/clipboard_aurax11.cc index 77c19c1..b075ddb 100644 --- a/ui/base/clipboard/clipboard_aurax11.cc +++ b/ui/base/clipboard/clipboard_aurax11.cc @@ -456,7 +456,8 @@ TargetList Clipboard::AuraX11Details::WaitAndGetTargetsList( NULL, &out_data_items, &out_type)) { - if (out_type == XA_ATOM) { + // Some apps return an |out_type| of "TARGETS". (crbug.com/377893) + if (out_type == XA_ATOM || out_type == atom_cache_.GetAtom(kTargets)) { const ::Atom* atom_array = reinterpret_cast<const ::Atom*>(data->front()); for (size_t i = 0; i < out_data_items; ++i) |