Convert infobar APIs to UTF-16.

chrome/browser/tab_contents/tab_contents_ssl_helper.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_ssl_helper.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/basictypes.h"
 #include "base/string_number_conversions.h"
@@ skipping 23 matching lines @@
                               net::X509Certificate* cert)
       : ConfirmInfoBarDelegate(tab_contents),
         tab_contents_(tab_contents),
         cert_(cert) {
   }
 
   virtual ~SSLCertAddedInfoBarDelegate() {
   }
 
   // Overridden from ConfirmInfoBarDelegate:
-  virtual std::wstring GetMessageText() const {
-    return l10n_util::GetStringF(IDS_ADD_CERT_SUCCESS_INFOBAR_LABEL,
-                                 UTF8ToWide(cert_->issuer().GetDisplayName()));
+  virtual string16 GetMessageText() const {
+    // TODO(evanm): GetDisplayName should return UTF-16.
+    return l10n_util::GetStringFUTF16(
+        IDS_ADD_CERT_SUCCESS_INFOBAR_LABEL,
+        UTF8ToUTF16(cert_->issuer().GetDisplayName()));
   }
 
   virtual SkBitmap* GetIcon() const {
     return GetCertIcon();
   }
 
   virtual int GetButtons() const {
     return BUTTON_OK;
   }
 
-  virtual std::wstring GetButtonLabel(InfoBarButton button) const {
+  virtual string16 GetButtonLabel(InfoBarButton button) const {
     switch (button) {
       case BUTTON_OK:
-        return l10n_util::GetString(IDS_ADD_CERT_SUCCESS_INFOBAR_BUTTON);
+        return l10n_util::GetStringUTF16(IDS_ADD_CERT_SUCCESS_INFOBAR_BUTTON);
       default:
-        return std::wstring();
+        return string16();
     }
   }
 
   virtual Type GetInfoBarType() {
     return PAGE_ACTION_TYPE;
   }
 
   virtual bool Accept() {
     ShowCertificateViewer(tab_contents_->GetMessageBoxRootWindow(), cert_);
     return false;  // Hiding the infobar just as the dialog opens looks weird.
@@ skipping 32 matching lines @@
   // still active.
   void ShowInfoBar(InfoBarDelegate* delegate) {
     if (infobar_delegate_) {
       tab_->ReplaceInfoBar(infobar_delegate_, delegate);
     } else {
       tab_->AddInfoBar(delegate);
     }
     infobar_delegate_ = delegate;
   }
 
   void ShowErrorInfoBar(const std::wstring& message) {

[viettrungluu, 2010/08/13 19:22:03]

We'll leave converting this to another day. ;)

     ShowInfoBar(
-        new SimpleAlertInfoBarDelegate(tab_, message, GetCertIcon(), true));
+        new SimpleAlertInfoBarDelegate(tab_, WideToUTF16(message), GetCertIcon(),

[viettrungluu, 2010/08/13 19:22:03]

80 cols

+                                       true));
   }
 
   // NotificationObserver implementation.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
     switch (type.value) {
       case NotificationType::TAB_CONTENTS_INFOBAR_REMOVED:
         InfoBarClosed(Details<InfoBarDelegate>(details).ptr());
         break;
@@ skipping 83 matching lines @@
 TabContentsSSLHelper::SSLAddCertData* TabContentsSSLHelper::GetAddCertData(
     SSLAddCertHandler* handler) {
   // Find/create the slot.
   linked_ptr<SSLAddCertData>& ptr_ref =
       request_id_to_add_cert_data_[handler->network_request_id()];
   // Fill it if necessary.
   if (!ptr_ref.get())
     ptr_ref.reset(new SSLAddCertData(tab_contents_, handler));
   return ptr_ref.get();
 }