extensions: Properly use string16 for Unicode text.

BUG=29850

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

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

1 files changed, 5 insertions, 5 deletions

diff --git a/chrome/browser/extensions/extension_install_ui.cc b/chrome/browser/extensions/extension_install_ui.cc
index c737f8f..0629340 100644
--- a/chrome/browser/extensions/extension_install_ui.cc
+++ b/chrome/browser/extensions/extension_install_ui.cc
@@ -111,7 +111,7 @@ ExtensionInstallUI::ExtensionInstallUI(Profile* profile)
 // static
 void ExtensionInstallUI::ShowExtensionInstallPrompt(
     Profile* profile, Delegate* delegate, Extension* extension, SkBitmap* icon,
-    const std::wstring& warning_text) {
+    const string16& warning_text) {
   ShowExtensionInstallUIPromptImpl(profile, delegate, extension, icon,
                                    warning_text, false);  // uninstall == false.
 }
@@ -119,7 +119,7 @@ void ExtensionInstallUI::ShowExtensionInstallPrompt(
 // static
 void ExtensionInstallUI::ShowExtensionUninstallPrompt(
     Profile* profile, Delegate* delegate, Extension* extension, SkBitmap* icon,
-    const std::wstring& warning_text) {
+    const string16& warning_text) {
   ShowExtensionInstallUIPromptImpl(profile, delegate, extension, icon,
                                    warning_text, true);  // uninstall == true.
 }
@@ -161,7 +161,7 @@ void ExtensionInstallUI::ConfirmInstall(Delegate* delegate,
                   NotificationService::NoDetails());
 
   ShowExtensionInstallPrompt(profile_, delegate, extension, &icon_,
-                             GetInstallWarning(extension));
+                             WideToUTF16Hack(GetInstallWarning(extension)));
 }
 
 void ExtensionInstallUI::ConfirmUninstall(Delegate* delegate,
@@ -174,8 +174,8 @@ void ExtensionInstallUI::ConfirmUninstall(Delegate* delegate,
         IDR_EXTENSION_DEFAULT_ICON);
   }
 
-  std::wstring message =
-      l10n_util::GetString(IDS_EXTENSION_UNINSTALL_CONFIRMATION);
+  string16 message =
+      l10n_util::GetStringUTF16(IDS_EXTENSION_UNINSTALL_CONFIRMATION);
   ShowExtensionUninstallPrompt(profile_, delegate, extension, icon, message);
 }