diff options
| author | dsh@google.com <dsh@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-16 22:36:55 +0000 |
|---|---|---|
| committer | dsh@google.com <dsh@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-16 22:36:55 +0000 |
| commit | 6ddd29f1f1a3d68d1f5546296bea956e502715c9 (patch) | |
| tree | fa9f27fbe7726a26ac6e89da2a4e7cbd00b25328 /base/clipboard.cc | |
| parent | c6f79b280b19c2b8c5f42f38f642888053599007 (diff) | |
| download | chromium_src-6ddd29f1f1a3d68d1f5546296bea956e502715c9.zip chromium_src-6ddd29f1f1a3d68d1f5546296bea956e502715c9.tar.gz chromium_src-6ddd29f1f1a3d68d1f5546296bea956e502715c9.tar.bz2 | |
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
Diffstat (limited to 'base/clipboard.cc')
| -rw-r--r-- | base/clipboard.cc | 7 |
1 files changed, 2 insertions, 5 deletions
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(); } } - |