diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 22:01:15 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 22:01:15 +0000 |
| commit | c033cbe94c504d2346c5e99c1ac12fda41f3f46a (patch) | |
| tree | 85e1dae7db66e8cf0cc56edb64d15d4a59a70010 /chrome/common | |
| parent | 75d52ac5b9e0c0531b17095a5750918c281a7f0d (diff) | |
| download | chromium_src-c033cbe94c504d2346c5e99c1ac12fda41f3f46a.zip chromium_src-c033cbe94c504d2346c5e99c1ac12fda41f3f46a.tar.gz chromium_src-c033cbe94c504d2346c5e99c1ac12fda41f3f46a.tar.bz2 | |
This changes the base clipboard class, as accomplishing paste requires that Clipboard::FormatType be IPC-able. The lowest-common denominator of unsigned int, NSString*, and GdkAtom is string, so string it is. (Linux changes by estade.)
Review URL: http://codereview.chromium.org/41012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11383 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/render_messages_internal.h | 2 | ||||
| -rw-r--r-- | chrome/common/temp_scaffolding_stubs.cc | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h index 80b78e1..bdbabaa 100644 --- a/chrome/common/render_messages_internal.h +++ b/chrome/common/render_messages_internal.h @@ -842,7 +842,7 @@ IPC_BEGIN_MESSAGES(ViewHost) IPC_SYNC_MESSAGE_CONTROL1_0(ViewHostMsg_ClipboardWriteObjectsSync, Clipboard::ObjectMap /* objects */) IPC_SYNC_MESSAGE_CONTROL1_1(ViewHostMsg_ClipboardIsFormatAvailable, - int /* format */, + std::string /* format */, bool /* result */) IPC_SYNC_MESSAGE_CONTROL0_1(ViewHostMsg_ClipboardReadText, string16 /* result */) diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc index 5d1e633..5d7f5c3 100644 --- a/chrome/common/temp_scaffolding_stubs.cc +++ b/chrome/common/temp_scaffolding_stubs.cc @@ -325,13 +325,6 @@ bool IsDefaultPluginEnabled() { return false; } -#if defined(OS_MACOSX) -bool ClipboardIsFormatAvailable(Clipboard::FormatType format) { - NOTIMPLEMENTED(); - return false; -} -#endif - } // webkit_glue #ifndef CHROME_DEBUGGER_DISABLED |