Convert HtmlDialogUIDelegate::GetDialogTitle() to string16.

chrome/browser/ui/cocoa/html_dialog_window_controller.mm

 // Copyright (c) 2011 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 "chrome/browser/ui/cocoa/html_dialog_window_controller.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 17 matching lines @@
                                  Profile* profile,
                                  HtmlDialogUIDelegate* delegate);
 
   virtual ~HtmlDialogWindowDelegateBridge();
 
   // Called when the window is directly closed, e.g. from the close
   // button or from an accelerator.
   void WindowControllerClosed();
 
   // HtmlDialogUIDelegate declarations.
-  virtual bool IsDialogModal() const;
-  virtual std::wstring GetDialogTitle() const;
-  virtual GURL GetDialogContentURL() const;
+  virtual bool IsDialogModal() const OVERRIDE;
+  virtual string16 GetDialogTitle() const OVERRIDE;
+  virtual GURL GetDialogContentURL() const OVERRIDE;
   virtual void GetWebUIMessageHandlers(
-      std::vector<WebUIMessageHandler*>* handlers) const;
-  virtual void GetDialogSize(gfx::Size* size) const;
-  virtual std::string GetDialogArgs() const;
-  virtual void OnDialogClosed(const std::string& json_retval);
-  virtual void OnCloseContents(TabContents* source, bool* out_close_dialog) { }
-  virtual bool ShouldShowDialogTitle() const { return true; }
+      std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE;
+  virtual void GetDialogSize(gfx::Size* size) const OVERRIDE;
+  virtual std::string GetDialogArgs() const OVERRIDE;
+  virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE;
+  virtual void OnCloseContents(TabContents* source, bool* out_close_dialog)
+      OVERRIDE { }
+  virtual bool ShouldShowDialogTitle() const OVERRIDE { return true; }
 
   // HtmlDialogTabContentsDelegate declarations.
   virtual void MoveContents(TabContents* source, const gfx::Rect& pos);
   virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);
 
 private:
   HtmlDialogWindowController* controller_;  // weak
   HtmlDialogUIDelegate* delegate_;  // weak, owned by controller_
 
   // Calls delegate_'s OnDialogClosed() exactly once, nulling it out
@@ skipping 58 matching lines @@
 // to NULL when the window is closed.
 
 bool HtmlDialogWindowDelegateBridge::IsDialogModal() const {
   // TODO(akalin): Support modal dialog boxes.
   if (delegate_ && delegate_->IsDialogModal()) {
     LOG(WARNING) << "Modal HTML dialogs are not supported yet";
   }
   return false;
 }
 
-std::wstring HtmlDialogWindowDelegateBridge::GetDialogTitle() const {
-  return delegate_ ? delegate_->GetDialogTitle() : L"";
+string16 HtmlDialogWindowDelegateBridge::GetDialogTitle() const {
+  return delegate_ ? delegate_->GetDialogTitle() : string16();
 }
 
 GURL HtmlDialogWindowDelegateBridge::GetDialogContentURL() const {
   return delegate_ ? delegate_->GetDialogContentURL() : GURL();
 }
 
 void HtmlDialogWindowDelegateBridge::GetWebUIMessageHandlers(
     std::vector<WebUIMessageHandler*>* handlers) const {
   if (delegate_) {
     delegate_->GetWebUIMessageHandlers(handlers);
@@ skipping 109 matching lines @@
                          defer:YES]);
   if (!window.get()) {
     return nil;
   }
   self = [super initWithWindow:window];
   if (!self) {
     return nil;
   }
   [window setWindowController:self];
   [window setDelegate:self];
-  [window setTitle:base::SysWideToNSString(delegate->GetDialogTitle())];
+  [window setTitle:base::SysUTF16ToNSString(delegate->GetDialogTitle())];
   [window center];
   delegate_.reset(new HtmlDialogWindowDelegateBridge(self, profile, delegate));
   return self;
 }
 
 - (void)loadDialogContents {
   tabContents_.reset(new TabContents(
       delegate_->profile(), NULL, MSG_ROUTING_NONE, NULL, NULL));
   [[self window] setContentView:tabContents_->GetNativeView()];
   tabContents_->set_delegate(delegate_.get());
@@ skipping 11 matching lines @@
   // TODO(akalin): Figure out why implementing (void)cancel:(id)sender
   // to do the above doesn't work.
 }
 
 - (void)windowWillClose:(NSNotification*)notification {
   delegate_->WindowControllerClosed();
   [self autorelease];
 }
 
 @end