diff options
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 |