Convert infobar APIs to UTF-16.

chrome/browser/browser_init.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/browser_init.h"
 
 #include <algorithm>   // For max().
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 114 matching lines @@
     return should_expire_;
   }
 
   // Overridden from ConfirmInfoBarDelegate:
   virtual void InfoBarClosed() {
     if (!action_taken_)
       UMA_HISTOGRAM_COUNTS("DefaultBrowserWarning.Ignored", 1);
     delete this;
   }
 
-  virtual std::wstring GetMessageText() const {
-    return l10n_util::GetString(IDS_DEFAULT_BROWSER_INFOBAR_SHORT_TEXT);
+  virtual string16 GetMessageText() const {
+    return l10n_util::GetStringUTF16(IDS_DEFAULT_BROWSER_INFOBAR_SHORT_TEXT);
   }
 
   virtual SkBitmap* GetIcon() const {
     return ResourceBundle::GetSharedInstance().GetBitmapNamed(
        IDR_PRODUCT_ICON_32);
   }
 
   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 {
     return button == BUTTON_OK ?
-        l10n_util::GetString(IDS_SET_AS_DEFAULT_INFOBAR_BUTTON_LABEL) :
-        l10n_util::GetString(IDS_DONT_ASK_AGAIN_INFOBAR_BUTTON_LABEL);
+        l10n_util::GetStringUTF16(IDS_SET_AS_DEFAULT_INFOBAR_BUTTON_LABEL) :
+        l10n_util::GetStringUTF16(IDS_DONT_ASK_AGAIN_INFOBAR_BUTTON_LABEL);
   }
 
   virtual bool NeedElevation(InfoBarButton button) const {
     return button == BUTTON_OK;
   }
 
   virtual bool Accept() {
     action_taken_ = true;
     UMA_HISTOGRAM_COUNTS("DefaultBrowserWarning.SetAsDefault", 1);
     g_browser_process->file_thread()->message_loop()->PostTask(FROM_HERE,
@@ skipping 79 matching lines @@
  public:
   explicit SessionCrashedInfoBarDelegate(TabContents* contents)
       : ConfirmInfoBarDelegate(contents),
         profile_(contents->profile()) {
   }
 
   // Overridden from ConfirmInfoBarDelegate:
   virtual void InfoBarClosed() {
     delete this;
   }
-  virtual std::wstring GetMessageText() const {
-    return l10n_util::GetString(IDS_SESSION_CRASHED_VIEW_MESSAGE);
+  virtual string16 GetMessageText() const {
+    return l10n_util::GetStringUTF16(IDS_SESSION_CRASHED_VIEW_MESSAGE);
   }
   virtual SkBitmap* GetIcon() const {
     return ResourceBundle::GetSharedInstance().GetBitmapNamed(
         IDR_INFOBAR_RESTORE_SESSION);
   }
   virtual int GetButtons() const { return BUTTON_OK; }
-  virtual std::wstring GetButtonLabel(InfoBarButton button) const {
-    return l10n_util::GetString(IDS_SESSION_CRASHED_VIEW_RESTORE_BUTTON);
+  virtual string16 GetButtonLabel(InfoBarButton button) const {
+    return l10n_util::GetStringUTF16(IDS_SESSION_CRASHED_VIEW_RESTORE_BUTTON);
   }
   virtual bool Accept() {
     // Restore the session.
     SessionRestore::RestoreSession(profile_, NULL, true, false,
                                    std::vector<GURL>());
     return true;
   }
 
  private:
   // The Profile that we restore sessions from.
@@ skipping 545 matching lines @@
   const char* bad_flag = NULL;
   for (const char** flag = kBadFlags; *flag; ++flag) {
     if (command_line_.HasSwitch(*flag)) {
       bad_flag = *flag;
       break;
     }
   }
 
   if (bad_flag) {
     tab->AddInfoBar(new SimpleAlertInfoBarDelegate(tab,
-        l10n_util::GetStringF(IDS_BAD_FLAGS_WARNING_MESSAGE,
-                              L"--" + ASCIIToWide(bad_flag)),
+        l10n_util::GetStringFUTF16(IDS_BAD_FLAGS_WARNING_MESSAGE,
+                                   UTF8ToUTF16(std::string("--") + bad_flag)),
         NULL, false));
   }
 }
 
 std::vector<GURL> BrowserInit::LaunchWithProfile::GetURLsFromCommandLine(
     Profile* profile) {
   std::vector<GURL> urls;
   const std::vector<CommandLine::StringType>& params = command_line_.args();
 
   for (size_t i = 0; i < params.size(); ++i) {
@@ skipping 247 matching lines @@
   scoped_refptr<AutomationProviderClass> automation =
       new AutomationProviderClass(profile);
   automation->ConnectToChannel(channel_id);
   automation->SetExpectedTabCount(expected_tabs);
 
   AutomationProviderList* list =
       g_browser_process->InitAutomationProviderList();
   DCHECK(list);
   list->AddProvider(automation);
 }