Update clipboard classes to use string16 and FilePath instead of wstring.

Update callers as well.

This patch builds on a patch by mark.a.lindner@gmail.com which can be found at http://codereview.chromium.org/28294

Review URL: http://codereview.chromium.org/27370

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10860 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 8 insertions, 6 deletions

diff --git a/chrome/browser/renderer_host/browser_render_process_host.h b/chrome/browser/renderer_host/browser_render_process_host.h
index dad06b5..03dfc43 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.h
+++ b/chrome/browser/renderer_host/browser_render_process_host.h
@@ -13,6 +13,7 @@
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/shared_memory.h"
+#include "base/string16.h"
 #include "base/timer.h"
 #include "chrome/common/transport_dib.h"
 #include "chrome/browser/renderer_host/audio_renderer_host.h"
@@ -99,9 +100,9 @@ class BrowserRenderProcessHost : public RenderProcessHost,
   void OnClipboardWriteBookmark(const std::wstring& title, const GURL& url);
   void OnClipboardWriteBitmap(base::SharedMemoryHandle bitmap, gfx::Size size);
   void OnClipboardIsFormatAvailable(unsigned int format, bool* result);
-  void OnClipboardReadText(std::wstring* result);
+  void OnClipboardReadText(string16* result);
   void OnClipboardReadAsciiText(std::string* result);
-  void OnClipboardReadHTML(std::wstring* markup, GURL* src_url);
+  void OnClipboardReadHTML(string16* markup, GURL* src_url);
 
   void OnUpdatedCacheStats(const CacheManager::UsageStats& stats);
 
diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc
index edec4d7..1f78df1 100644
--- a/chrome/browser/renderer_host/resource_message_filter.cc
+++ b/chrome/browser/renderer_host/resource_message_filter.cc
@@ -551,7 +551,7 @@ void ResourceMessageFilter::OnClipboardIsFormatAvailable(unsigned int format,
 #endif
 }
 
-void ResourceMessageFilter::OnClipboardReadText(std::wstring* result) {
+void ResourceMessageFilter::OnClipboardReadText(string16* result) {
   GetClipboardService()->ReadText(result);
 }
 
@@ -559,7 +559,7 @@ void ResourceMessageFilter::OnClipboardReadAsciiText(std::string* result) {
   GetClipboardService()->ReadAsciiText(result);
 }
 
-void ResourceMessageFilter::OnClipboardReadHTML(std::wstring* markup,
+void ResourceMessageFilter::OnClipboardReadHTML(string16* markup,
                                                 GURL* src_url) {
   std::string src_url_str;
   GetClipboardService()->ReadHTML(markup, &src_url_str);
diff --git a/chrome/browser/renderer_host/resource_message_filter.h b/chrome/browser/renderer_host/resource_message_filter.h
index b131488..679a0ac 100644
--- a/chrome/browser/renderer_host/resource_message_filter.h
+++ b/chrome/browser/renderer_host/resource_message_filter.h
@@ -14,6 +14,7 @@
 #include "base/gfx/native_widget_types.h"
 #include "base/ref_counted.h"
 #include "base/shared_memory.h"
+#include "base/string16.h"
 #include "build/build_config.h"
 #include "chrome/browser/net/resolve_proxy_msg_helper.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
@@ -156,9 +157,9 @@ class ResourceMessageFilter : public IPC::ChannelProxy::MessageFilter,
   // Clipboard messages
   void OnClipboardWriteObjects(const Clipboard::ObjectMap& objects);
   void OnClipboardIsFormatAvailable(unsigned int format, bool* result);
-  void OnClipboardReadText(std::wstring* result);
+  void OnClipboardReadText(string16* result);
   void OnClipboardReadAsciiText(std::string* result);
-  void OnClipboardReadHTML(std::wstring* markup, GURL* src_url);
+  void OnClipboardReadHTML(string16* markup, GURL* src_url);
 #if defined(OS_WIN)|| defined(OS_LINUX)
   void OnGetWindowRect(gfx::NativeViewId window, gfx::Rect *rect);
   void OnGetRootWindowRect(gfx::NativeViewId window, gfx::Rect *rect);