Convert infobar APIs to UTF-16.

chrome/browser/cocoa/infobar_controller.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/logging.h"  // for NOTREACHED()
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/cocoa/animatable_view.h"
@@ skipping 326 matching lines @@
 @implementation AlertInfoBarController
 
 // Alert infobars have a text message.
 - (void)addAdditionalControls {
   // No buttons.
   [self removeButtons];
 
   // Insert the text.
   AlertInfoBarDelegate* delegate = delegate_->AsAlertInfoBarDelegate();
   DCHECK(delegate);
-  [self setLabelToMessage:base::SysWideToNSString(delegate->GetMessageText())];
+  [self setLabelToMessage:base::SysUTF16ToNSString(delegate->GetMessageText())];
 }
 
 @end
 
 
 /////////////////////////////////////////////////////////////////////////
 // LinkInfoBarController implementation
 
 @implementation LinkInfoBarController
 
 // Link infobars have a text message, of which part is linkified.  We
 // use an NSAttributedString to display styled text, and we set a
 // NSLink attribute on the hyperlink portion of the message.  Infobars
 // use a custom NSTextField subclass, which allows us to override
 // textView:clickedOnLink:atIndex: and intercept clicks.
 //
 - (void)addAdditionalControls {
   // No buttons.
   [self removeButtons];
 
   LinkInfoBarDelegate* delegate = delegate_->AsLinkInfoBarDelegate();
   DCHECK(delegate);
   size_t offset = std::wstring::npos;
-  std::wstring message = delegate->GetMessageTextWithOffset(&offset);
-  [self setLabelToMessage:base::SysWideToNSString(message)
-                 withLink:base::SysWideToNSString(delegate->GetLinkText())
+  string16 message = delegate->GetMessageTextWithOffset(&offset);
+  [self setLabelToMessage:base::SysUTF16ToNSString(message)
+                 withLink:base::SysUTF16ToNSString(delegate->GetLinkText())
                  atOffset:offset];
 }
 
 // Called when someone clicks on the link in the infobar.  This method
 // is called by the InfobarTextField on its delegate (the
 // LinkInfoBarController).
 - (void)linkClicked {
   WindowOpenDisposition disposition =
       event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
   if (delegate_ && delegate_->AsLinkInfoBarDelegate()->LinkClicked(disposition))
@@ skipping 35 matching lines @@
       << "Cancel button expected to be on the right of the Ok button in nib";
 
   CGFloat rightEdge = NSMaxX(cancelButtonFrame);
   CGFloat spaceBetweenButtons =
       NSMinX(cancelButtonFrame) - NSMaxX(okButtonFrame);
   CGFloat spaceBeforeButtons =
       NSMinX(okButtonFrame) - NSMaxX([label_.get() frame]);
 
   // Update and position the Cancel button if needed.  Otherwise, hide it.
   if (visibleButtons & ConfirmInfoBarDelegate::BUTTON_CANCEL) {
-    [cancelButton_ setTitle:base::SysWideToNSString(
+    [cancelButton_ setTitle:base::SysUTF16ToNSString(
           delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_CANCEL))];
     [GTMUILocalizerAndLayoutTweaker sizeToFitView:cancelButton_];
     cancelButtonFrame = [cancelButton_ frame];
 
     // Position the cancel button to the left of the Close button.
     cancelButtonFrame.origin.x = rightEdge - cancelButtonFrame.size.width;
     [cancelButton_ setFrame:cancelButtonFrame];
 
     // Update the rightEdge
     rightEdge = NSMinX(cancelButtonFrame);
   } else {
     [cancelButton_ removeFromSuperview];
   }
 
   // Update and position the OK button if needed.  Otherwise, hide it.
   if (visibleButtons & ConfirmInfoBarDelegate::BUTTON_OK) {
-    [okButton_ setTitle:base::SysWideToNSString(
+    [okButton_ setTitle:base::SysUTF16ToNSString(
           delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_OK))];
     [GTMUILocalizerAndLayoutTweaker sizeToFitView:okButton_];
     okButtonFrame = [okButton_ frame];
 
     // If we had a Cancel button, leave space between the buttons.
     if (visibleButtons & ConfirmInfoBarDelegate::BUTTON_CANCEL) {
       rightEdge -= spaceBetweenButtons;
     }
 
     // Position the OK button on our current right edge.
@@ skipping 13 matching lines @@
     rightEdge -= spaceBeforeButtons;
   }
 
   NSRect frame = [label_.get() frame];
   DCHECK(rightEdge > NSMinX(frame))
       << "Need to make the xib larger to handle buttons with text this long";
   frame.size.width = rightEdge - NSMinX(frame);
   [label_.get() setFrame:frame];
 
   // Set the text and link.
-  NSString* message = base::SysWideToNSString(delegate->GetMessageText());
-  std::wstring link = delegate->GetLinkText();
+  NSString* message = base::SysUTF16ToNSString(delegate->GetMessageText());
+  string16 link = delegate->GetLinkText();
   if (link.empty()) {
     // Simple case: no link, so just set the message directly.
     [self setLabelToMessage:message];
   } else {
     // Inserting the link unintentionally causes the text to have a slightly
     // different result to the simple case above: text is truncated on word
     // boundaries (if needed) rather than elided with ellipses.
 
     // Add spacing between the label and the link.
     message = [message stringByAppendingString:@"   "];
     [self setLabelToMessage:message
-                   withLink:base::SysWideToNSString(link)
+                   withLink:base::SysUTF16ToNSString(link)
                    atOffset:[message length]];
   }
 }
 
 // Called when someone clicks on the link in the infobar.  This method
 // is called by the InfobarTextField on its delegate (the
 // LinkInfoBarController).
 - (void)linkClicked {
   WindowOpenDisposition disposition =
       event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
@@ skipping 18 matching lines @@
   LinkInfoBarController* controller =
       [[LinkInfoBarController alloc] initWithDelegate:this];
   return new InfoBar(controller);
 }
 
 InfoBar* ConfirmInfoBarDelegate::CreateInfoBar() {
   ConfirmInfoBarController* controller =
       [[ConfirmInfoBarController alloc] initWithDelegate:this];
   return new InfoBar(controller);
 }