diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-14 18:51:25 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-14 18:51:25 +0000 |
| commit | c2273e84167c70eed66fa5b0fd9caa0c3728695b (patch) | |
| tree | f17d452451a25bf84c40c28f8e75cfe097463ceb /webkit | |
| parent | a2358df826ac582aba81cdd1c780483e41f79529 (diff) | |
| download | chromium_src-c2273e84167c70eed66fa5b0fd9caa0c3728695b.zip chromium_src-c2273e84167c70eed66fa5b0fd9caa0c3728695b.tar.gz chromium_src-c2273e84167c70eed66fa5b0fd9caa0c3728695b.tar.bz2 | |
Disable selection on aura. Clipboard semantics on aura must be same as windows
BUG=103490
TEST=ExtensionClipboardApiTest passes on aura
Review URL: http://codereview.chromium.org/8540031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109915 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webclipboard_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/glue/webclipboard_impl.cc b/webkit/glue/webclipboard_impl.cc index 03614b0..0cbecaf 100644 --- a/webkit/glue/webclipboard_impl.cc +++ b/webkit/glue/webclipboard_impl.cc @@ -227,7 +227,7 @@ bool WebClipboardImpl::ConvertBufferType(Buffer buffer, *result = ui::Clipboard::BUFFER_STANDARD; break; case BufferSelection: -#if defined(USE_X11) +#if defined(USE_X11) && !defined(USE_AURA) *result = ui::Clipboard::BUFFER_SELECTION; break; #endif |