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

Unified Diff: content/renderer/webclipboard_impl.cc

Issue 224843013: don't hit NOTREACHED when pasting on non-x11 non-chromeos unix builds (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: leave TODO note Created 6 years, 8 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: content/renderer/webclipboard_impl.cc
diff --git a/content/renderer/webclipboard_impl.cc b/content/renderer/webclipboard_impl.cc
index 2408eda86dcee3b5a4d2e0501d2922355bd9e667..317ec7d283d707849e2829b8035760fd2530d4b7 100644
--- a/content/renderer/webclipboard_impl.cc
+++ b/content/renderer/webclipboard_impl.cc
@@ -203,15 +203,14 @@ bool WebClipboardImpl::ConvertBufferType(Buffer buffer,
case BufferStandard:
break;
case BufferSelection:
-#if defined(USE_X11)
-#if defined(OS_CHROMEOS)
- // Chrome OS only supports the standard clipboard,
- // but not the X selection clipboad.
- return false;
-#else
+#if defined(USE_X11) && !defined(OS_CHROMEOS)
*result = ui::CLIPBOARD_TYPE_SELECTION;
break;
-#endif
+#else
+ // Chrome OS and non-X11 unix builds do not support
+ // the X selection clipboad.
+ // TODO: remove the need for this case, see http://crbug.com/361753
+ return false;
#endif
default:
NOTREACHED();
« 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