From 6ddd29f1f1a3d68d1f5546296bea956e502715c9 Mon Sep 17 00:00:00 2001 From: "dsh@google.com" Date: Tue, 16 Dec 2008 22:36:55 +0000 Subject: Prevents LayoutTests/editing/pasteboard/copy-standalone-image.html from crashing on NOTREACHED. The paste actually already works. The diff is still wrong. Review URL: http://codereview.chromium.org/14473 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7106 0039d316-1c4b-4281-b951-d872f2087c98 --- base/clipboard.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'base/clipboard.cc') diff --git a/base/clipboard.cc b/base/clipboard.cc index 21b00fc..60851e2 100644 --- a/base/clipboard.cc +++ b/base/clipboard.cc @@ -20,7 +20,6 @@ void Clipboard::DispatchObject(ObjectType type, const ObjectMapParams& params) { WriteHTML(&(params[0].front()), params[0].size(), NULL, 0); break; -#if defined(OS_WIN) || defined(OS_MACOSX) case CBF_BOOKMARK: WriteBookmark(&(params[0].front()), params[0].size(), &(params[1].front()), params[1].size()); @@ -34,20 +33,18 @@ void Clipboard::DispatchObject(ObjectType type, const ObjectMapParams& params) { case CBF_FILES: WriteFiles(&(params[0].front()), params[0].size()); break; -#endif // defined(OS_WIN) || defined(OS_MACOSX) case CBF_WEBKIT: WriteWebSmartPaste(); break; -#if defined(OS_WIN) +#if defined(OS_WIN) || defined(OS_LINUX) // This is just a stub on Linux case CBF_BITMAP: WriteBitmap(&(params[0].front()), &(params[1].front())); break; -#endif // defined(OS_WIN) +#endif // defined(OS_WIN) || defined(OS_LINUX) default: NOTREACHED(); } } - -- cgit v1.1