diff options
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/chromium_bridge_impl.cc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/webkit/glue/chromium_bridge_impl.cc b/webkit/glue/chromium_bridge_impl.cc index bb8efd0..b817d95c 100644 --- a/webkit/glue/chromium_bridge_impl.cc +++ b/webkit/glue/chromium_bridge_impl.cc @@ -85,19 +85,16 @@ bool ChromiumBridge::clipboardIsFormatAvailable( return webkit_glue::ClipboardIsFormatAvailable( ::Clipboard::GetHtmlFormatType()); + case PasteboardPrivate::WebSmartPasteFormat: + return webkit_glue::ClipboardIsFormatAvailable( + ::Clipboard::GetWebKitSmartPasteFormatType()); + case PasteboardPrivate::BookmarkFormat: #if defined(OS_WIN) || defined(OS_MACOSX) return webkit_glue::ClipboardIsFormatAvailable( ::Clipboard::GetUrlWFormatType()); #endif -#if defined(OS_WIN) - // TODO(tc): This should work for linux/mac too. - case PasteboardPrivate::WebSmartPasteFormat: - return webkit_glue::ClipboardIsFormatAvailable( - ::Clipboard::GetWebKitSmartPasteFormatType()); -#endif - default: NOTREACHED(); return false; @@ -141,10 +138,8 @@ void ChromiumBridge::clipboardWriteSelection(const String& html, webkit_glue::CStringToStdString(url.utf8String())); scw.WriteText(webkit_glue::StringToStdWString(plain_text)); -#if defined(OS_WIN) if (can_smart_copy_or_delete) scw.WriteWebSmartPaste(); -#endif } void ChromiumBridge::clipboardWriteURL(const KURL& url, const String& title) { |