diff options
| author | pinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-17 14:45:48 +0000 |
|---|---|---|
| committer | pinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-17 14:45:48 +0000 |
| commit | c3fac8bf704df395a6359e9da9edeca28ff34de0 (patch) | |
| tree | 165cec5b2e3e50c2666d8205bbc661d17242cd21 /webkit | |
| parent | 0c4bfbd9655bc99c0fd92f6476c3c2915cca0004 (diff) | |
| download | chromium_src-c3fac8bf704df395a6359e9da9edeca28ff34de0.zip chromium_src-c3fac8bf704df395a6359e9da9edeca28ff34de0.tar.gz chromium_src-c3fac8bf704df395a6359e9da9edeca28ff34de0.tar.bz2 | |
Implement the WebSmartPaste pasteboard type on Mac, stub it out on Linux, remove the platform ifdefs in common code.
Review URL: http://codereview.chromium.org/10955
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5559 0039d316-1c4b-4281-b951-d872f2087c98
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) { |