Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(651)

Unified Diff: webkit/glue/webclipboard_impl.cc

Issue 10828233: crbug.com/121235 - Renderer crash on middle-click on Linux Desktop. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: chg USE_AURA to OS_CHROMEOS Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webclipboard_impl.cc
diff --git a/webkit/glue/webclipboard_impl.cc b/webkit/glue/webclipboard_impl.cc
index eb71a615f4a27b7acd5404747a658740029915af..3dff08f28c9bcece37fef3c7d363c830a82dc0ab 100644
--- a/webkit/glue/webclipboard_impl.cc
+++ b/webkit/glue/webclipboard_impl.cc
@@ -258,10 +258,16 @@ bool WebClipboardImpl::ConvertBufferType(Buffer buffer,
*result = ui::Clipboard::BUFFER_STANDARD;
break;
case BufferSelection:
-#if defined(USE_X11) && !defined(USE_AURA)
+#if defined(USE_X11)
+#if defined(OS_CHROMEOS)
+ // Chrome OS only supports the standard clipboard,
+ // but not the X selection clipboad.
+ return false;
+#else
*result = ui::Clipboard::BUFFER_SELECTION;
break;
#endif
+#endif
default:
NOTREACHED();
return false;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698