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

2 files changed, 5 insertions, 4 deletions

diff --git a/chrome/browser/tab_contents/render_view_context_menu_controller.cc b/chrome/browser/tab_contents/render_view_context_menu_controller.cc
index 714f24c..4afcc86 100644
--- a/chrome/browser/tab_contents/render_view_context_menu_controller.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu_controller.cc
@@ -67,7 +67,7 @@ void RenderViewContextMenuController::Inspect(int x, int y) {
 }
 
 void RenderViewContextMenuController::WriteTextToClipboard(
-    const std::wstring& text) {
+    const string16& text) {
   ClipboardService* clipboard = g_browser_process->clipboard_service();
 
   if (!clipboard)
@@ -79,9 +79,9 @@ void RenderViewContextMenuController::WriteTextToClipboard(
 
 void RenderViewContextMenuController::WriteURLToClipboard(const GURL& url) {
   if (url.SchemeIs(chrome::kMailToScheme))
-    WriteTextToClipboard(UTF8ToWide(url.path()));
+    WriteTextToClipboard(UTF8ToUTF16(url.path()));
   else
-    WriteTextToClipboard(UTF8ToWide(url.spec()));
+    WriteTextToClipboard(UTF8ToUTF16(url.spec()));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/tab_contents/render_view_context_menu_controller.h b/chrome/browser/tab_contents/render_view_context_menu_controller.h
index 9d18ff6..0c72dcc 100644
--- a/chrome/browser/tab_contents/render_view_context_menu_controller.h
+++ b/chrome/browser/tab_contents/render_view_context_menu_controller.h
@@ -7,6 +7,7 @@
 
 #include "build/build_config.h"
 
+#include "base/string16.h"
 #include "chrome/common/pref_member.h"
 #include "chrome/common/page_transition_types.h"
 #include "webkit/glue/context_menu.h"
@@ -49,7 +50,7 @@ class RenderViewContextMenuController : public Menu::Delegate {
   void Inspect(int x, int y);
 
   // Writes the specified text/url to the system clipboard
-  void WriteTextToClipboard(const std::wstring& text);
+  void WriteTextToClipboard(const string16& text);
   void WriteURLToClipboard(const GURL& url);
 
   bool IsDevCommandEnabled(int id) const;