Convert infobar APIs to UTF-16.

chrome/browser/tab_contents/tab_contents.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/tab_contents/tab_contents.h"
 
 #if defined(OS_CHROMEOS)
 // For GdkScreen
 #include <gdk/gdk.h>
 #endif  // defined(OS_CHROMEOS)
@@ skipping 235 matching lines @@
         tab_contents_(tab_contents),
         name_(name),
         update_url_(update_url) {
     tab_contents->AddInfoBar(this);
   }
 
   virtual int GetButtons() const {
     return BUTTON_OK | BUTTON_CANCEL | BUTTON_OK_DEFAULT;
   }
 
-  virtual std::wstring GetButtonLabel(InfoBarButton button) const {
+  virtual string16 GetButtonLabel(InfoBarButton button) const {
     if (button == BUTTON_CANCEL)
-      return l10n_util::GetString(IDS_PLUGIN_ENABLE_TEMPORARILY);
+      return l10n_util::GetStringUTF16(IDS_PLUGIN_ENABLE_TEMPORARILY);
     if (button == BUTTON_OK)
-      return l10n_util::GetString(IDS_PLUGIN_UPDATE);
+      return l10n_util::GetStringUTF16(IDS_PLUGIN_UPDATE);
     return ConfirmInfoBarDelegate::GetButtonLabel(button);
   }
 
-  virtual std::wstring GetMessageText() const {
-    return UTF16ToWide(l10n_util::GetStringFUTF16(IDS_PLUGIN_OUTDATED_PROMPT,
-                                                  name_));
+  virtual string16 GetMessageText() const {
+    return l10n_util::GetStringFUTF16(IDS_PLUGIN_OUTDATED_PROMPT, name_);
   }
 
-  virtual std::wstring GetLinkText() {
-    return l10n_util::GetString(IDS_LEARN_MORE);
+  virtual string16 GetLinkText() {
+    return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
   }
 
   virtual SkBitmap* GetIcon() const {
     return ResourceBundle::GetSharedInstance().GetBitmapNamed(
         IDR_INFOBAR_PLUGIN_INSTALL);
   }
 
   virtual bool Accept() {
     tab_contents_->OpenURL(update_url_, GURL(),
                            CURRENT_TAB, PageTransition::LINK);
@@ skipping 1705 matching lines @@
         plugin_name.erase(plugin_name.length() - plugin_extension.length());
 #endif  // OS_MACOSX
     }
   }
 #else
   NOTIMPLEMENTED() << " convert plugin path to plugin name";
 #endif
   SkBitmap* crash_icon = ResourceBundle::GetSharedInstance().GetBitmapNamed(
       IDR_INFOBAR_PLUGIN_CRASHED);
   AddInfoBar(new SimpleAlertInfoBarDelegate(
-      this, l10n_util::GetStringF(IDS_PLUGIN_CRASHED_PROMPT, plugin_name),
+      this, l10n_util::GetStringFUTF16(IDS_PLUGIN_CRASHED_PROMPT,
+                                       WideToUTF16Hack(plugin_name)),
       crash_icon, true));
 }
 
 void TabContents::OnCrashedWorker() {
   AddInfoBar(new SimpleAlertInfoBarDelegate(
-      this, l10n_util::GetString(IDS_WEBWORKER_CRASHED_PROMPT),
+      this, l10n_util::GetStringUTF16(IDS_WEBWORKER_CRASHED_PROMPT),
       NULL, true));
 }
 
 void TabContents::OnDidGetApplicationInfo(
     int32 page_id,
     const webkit_glue::WebApplicationInfo& info) {
   web_app_info_ = info;
 
   if (delegate())
     delegate()->OnDidGetApplicationInfo(this, page_id);
@@ skipping 848 matching lines @@
 
 void TabContents::OnIgnoredUIEvent() {
   if (constrained_window_count()) {
     ConstrainedWindow* window = *constrained_window_begin();
     window->FocusConstrainedWindow();
   }
 }
 
 void TabContents::OnJSOutOfMemory() {
   AddInfoBar(new SimpleAlertInfoBarDelegate(
-      this, l10n_util::GetString(IDS_JS_OUT_OF_MEMORY_PROMPT), NULL, true));
+                 this, l10n_util::GetStringUTF16(IDS_JS_OUT_OF_MEMORY_PROMPT),
+                 NULL, true));
 }
 
 void TabContents::OnCrossSiteResponse(int new_render_process_host_id,
                                       int new_request_id) {
   // Allows the TabContents to react when a cross-site response is ready to be
   // delivered to a pending RenderViewHost.  We must first run the onunload
   // handler of the old RenderViewHost before we can allow it to proceed.
   render_manager_.OnCrossSiteResponse(new_render_process_host_id,
                                       new_request_id);
 }
@@ skipping 357 matching lines @@
 
   // Begin ConfirmInfoBarDelegate implementation.
   virtual void InfoBarClosed() {
     UMA_HISTOGRAM_ENUMERATION("PasswordManager.InfoBarResponse",
                               infobar_response_, NUM_RESPONSE_TYPES);
     delete this;
   }
 
   virtual Type GetInfoBarType() { return PAGE_ACTION_TYPE; }
 
-  virtual std::wstring GetMessageText() const {
-    return l10n_util::GetString(IDS_PASSWORD_MANAGER_SAVE_PASSWORD_PROMPT);
+  virtual string16 GetMessageText() const {
+    return l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_SAVE_PASSWORD_PROMPT);
   }
 
   virtual SkBitmap* GetIcon() const {
     return ResourceBundle::GetSharedInstance().GetBitmapNamed(
         IDR_INFOBAR_SAVE_PASSWORD);
   }
 
   virtual int GetButtons() const {
     return BUTTON_OK | BUTTON_CANCEL;
   }
 
-  virtual std::wstring GetButtonLabel(InfoBarButton button) const {
+  virtual string16 GetButtonLabel(InfoBarButton button) const {
     if (button == BUTTON_OK)
-      return l10n_util::GetString(IDS_PASSWORD_MANAGER_SAVE_BUTTON);
+      return l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_SAVE_BUTTON);
     if (button == BUTTON_CANCEL)
-      return l10n_util::GetString(IDS_PASSWORD_MANAGER_BLACKLIST_BUTTON);
+      return l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_BLACKLIST_BUTTON);
     NOTREACHED();
-    return std::wstring();
+    return string16();
   }
 
   virtual bool Accept() {
     DCHECK(form_to_save_.get());
     form_to_save_->Save();
     infobar_response_ = REMEMBER_PASSWORD;
     return true;
   }
 
   virtual bool Cancel() {
@@ skipping 30 matching lines @@
   AddInfoBar(new SavePasswordInfoBarDelegate(this, form_to_save));
 }
 
 Profile* TabContents::GetProfileForPasswordManager() {
   return profile();
 }
 
 bool TabContents::DidLastPageLoadEncounterSSLErrors() {
   return controller().ssl_manager()->ProcessedSSLErrorFromRequest();
 }