From 3e3d52034e80c1a9568706952d492c813d2224dc Mon Sep 17 00:00:00 2001 From: "mostynb@opera.com" Date: Sat, 12 Apr 2014 00:06:59 +0000 Subject: Chromeos and non-X11 unix builds should not hit NOTREACHED when pasting. BUG=361341 TEST=ClickModifierTest.WindowOpenShiftMiddleClickTest Review URL: https://codereview.chromium.org/224843013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263420 0039d316-1c4b-4281-b951-d872f2087c98 --- content/renderer/webclipboard_impl.cc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/content/renderer/webclipboard_impl.cc b/content/renderer/webclipboard_impl.cc index 2408eda..317ec7d 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(); -- cgit v1.1