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

7 files changed, 7 insertions, 29 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
index 6df7ff4..a25845d 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
@@ -2017,7 +2017,7 @@ void AutocompleteEditViewWin::TextChanged() {
 std::wstring AutocompleteEditViewWin::GetClipboardText() const {
   // Try text format.
   ClipboardService* clipboard = g_browser_process->clipboard_service();
-  if (clipboard->IsFormatAvailable(CF_UNICODETEXT)) {
+  if (clipboard->IsFormatAvailable(Clipboard::GetPlainTextWFormatType())) {
     std::wstring text;
     clipboard->ReadText(&text);
 
diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc
index 4fce635..8492cc6 100644
--- a/chrome/browser/renderer_host/resource_message_filter.cc
+++ b/chrome/browser/renderer_host/resource_message_filter.cc
@@ -540,15 +540,10 @@ void ResourceMessageFilter::OnClipboardWriteObjects(
       new WriteClipboardTask(long_living_objects));
 }
 
-void ResourceMessageFilter::OnClipboardIsFormatAvailable(unsigned int format,
-                                                         bool* result) {
-#if defined(OS_WIN)
+void ResourceMessageFilter::OnClipboardIsFormatAvailable(
+    Clipboard::FormatType format, bool* result) {
   DCHECK(result);
   *result = GetClipboardService()->IsFormatAvailable(format);
-#else
-  NOTIMPLEMENTED();  // TODO(port) this function should take a
-                     // Clipboard::FormatType instead of an int.
-#endif
 }
 
 void ResourceMessageFilter::OnClipboardReadText(string16* result) {
diff --git a/chrome/browser/renderer_host/resource_message_filter.h b/chrome/browser/renderer_host/resource_message_filter.h
index 823685a..55ce1be 100644
--- a/chrome/browser/renderer_host/resource_message_filter.h
+++ b/chrome/browser/renderer_host/resource_message_filter.h
@@ -155,7 +155,7 @@ class ResourceMessageFilter : public IPC::ChannelProxy::MessageFilter,
   void OnReceiveContextMenuMsg(const IPC::Message& msg);
   // Clipboard messages
   void OnClipboardWriteObjects(const Clipboard::ObjectMap& objects);
-  void OnClipboardIsFormatAvailable(unsigned int format, bool* result);
+  void OnClipboardIsFormatAvailable(Clipboard::FormatType format, bool* result);
   void OnClipboardReadText(string16* result);
   void OnClipboardReadAsciiText(std::string* result);
   void OnClipboardReadHTML(string16* markup, GURL* src_url);
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
diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc
index 22b2775..6cace23 100644
--- a/chrome/renderer/renderer_glue.cc
+++ b/chrome/renderer/renderer_glue.cc
@@ -189,17 +189,7 @@ Clipboard* ClipboardGetClipboard(){
   return NULL;
 }
 
-#if defined(OS_LINUX)
-// TODO(port): This should replace the method below (the unsigned int is a
-// windows type).  We may need to convert the type of format so it can be sent
-// over IPC.
-bool ClipboardIsFormatAvailable(Clipboard::FormatType format) {
-  NOTIMPLEMENTED();
-  return false;
-}
-#endif
-
-bool ClipboardIsFormatAvailable(unsigned int format) {
+bool ClipboardIsFormatAvailable(const Clipboard::FormatType& format) {
   bool result;
   RenderThread::current()->Send(
       new ViewHostMsg_ClipboardIsFormatAvailable(format, &result));
diff --git a/chrome/views/text_field.cc b/chrome/views/text_field.cc
index d0ec3da..10a154c 100644
--- a/chrome/views/text_field.cc
+++ b/chrome/views/text_field.cc
@@ -761,7 +761,7 @@ void TextField::Edit::OnPaste() {
 
   ClipboardService* clipboard = g_browser_process->clipboard_service();
 
-  if (!clipboard->IsFormatAvailable(CF_UNICODETEXT))
+  if (!clipboard->IsFormatAvailable(Clipboard::GetPlainTextWFormatType()))
     return;
 
   std::wstring clipboard_str;