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.h | |
| 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.h')
| -rw-r--r-- | base/clipboard.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/base/clipboard.h b/base/clipboard.h index caf0dbf..64f9e3a 100644 --- a/base/clipboard.h +++ b/base/clipboard.h @@ -155,9 +155,9 @@ class Clipboard { void WriteFiles(const char* file_data, size_t file_len); void DispatchObject(ObjectType type, const ObjectMapParams& params); -#if defined(OS_WIN) - void WriteBitmap(const char* pixel_data, const char* size_data); + void WriteBitmap(const char* pixel_data, const char* size_data); +#if defined(OS_WIN) void WriteBitmapFromSharedMemory(const char* bitmap_data, const char* size_data, base::ProcessHandle handle); @@ -204,4 +204,3 @@ class Clipboard { }; #endif // BASE_CLIPBOARD_H_ - |