Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(152)

Unified Diff: webkit/glue/chromium_bridge_impl.cc

Issue 10955: Implement the WebSmartPaste pasteboard type on Mac, stub it out on Linux, rem... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/scoped_clipboard_writer.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/chromium_bridge_impl.cc
===================================================================
--- webkit/glue/chromium_bridge_impl.cc (revision 5474)
+++ webkit/glue/chromium_bridge_impl.cc (working copy)
@@ -80,19 +80,16 @@
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;
@@ -136,10 +133,8 @@
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) {
« no previous file with comments | « base/scoped_clipboard_writer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698