Convert HtmlDialogUIDelegate::GetDialogTitle() to string16.

chrome/browser/ui/views/select_file_dialog.cc

 // 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.
 
 #include "chrome/browser/ui/shell_dialogs.h"
 
 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 61 matching lines @@
     // Owner of this FileBrowseDelegate.
     scoped_refptr<SelectFileDialogImpl> owner_;
 
     // Parent window.
     gfx::NativeWindow parent_;
 
     // The type of dialog we are showing the user.
     Type type_;
 
     // The dialog title.
-    std::wstring title_;
+    string16 title_;
 
     // Default path of the file dialog.
     FilePath default_path_;
 
     // The file filters.
     FileTypeInfo file_types_;
 
     // The index of the default selected file filter.
     // Note: This starts from 1, not 0.
     int file_type_index_;
 
     // Default extension to be added to file if user does not type one.
     FilePath::StringType default_extension_;
 
     // Associated user data.
     void* params_;
 
    private:
     ~FileBrowseDelegate();
 
     // Overridden from HtmlDialogUI::Delegate:
-    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) {
+        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 { return true; }
-    virtual bool HandleContextMenu(const ContextMenuParams& params) {
+    virtual bool ShouldShowDialogTitle() const OVERRIDE { return true; }
+    virtual bool HandleContextMenu(const ContextMenuParams& params) OVERRIDE {
       return true;
     }
 
     DISALLOW_COPY_AND_ASSIGN(FileBrowseDelegate);
   };
 
   class FileBrowseDelegateHandler : public WebUIMessageHandler {
    public:
     explicit FileBrowseDelegateHandler(FileBrowseDelegate* delegate);
 
@@ skipping 168 matching lines @@
     const std::wstring& title,
     const FilePath& default_path,
     const FileTypeInfo* file_types,
     int file_type_index,
     const FilePath::StringType& default_extension,
     gfx::NativeWindow parent,
     void* params)
   : owner_(owner),
     parent_(parent),
     type_(type),
-    title_(title),
+    title_(WideToUTF16Hack(title)),
     default_path_(default_path),
     file_type_index_(file_type_index),
     default_extension_(default_extension),
     params_(params) {
   if (file_types)
     file_types_ = *file_types;
   else
     file_types_.include_all_files = true;
 }
 
 SelectFileDialogImpl::FileBrowseDelegate::~FileBrowseDelegate() {
 }
 
 bool SelectFileDialogImpl::FileBrowseDelegate::IsDialogModal() const {
   return true;
 }
 
-std::wstring SelectFileDialogImpl::FileBrowseDelegate::GetDialogTitle() const {
+string16 SelectFileDialogImpl::FileBrowseDelegate::GetDialogTitle() const {
   return title_;
 }
 
 GURL SelectFileDialogImpl::FileBrowseDelegate::GetDialogContentURL() const {
   std::string url_string(chrome::kChromeUIFileBrowseURL);
 
   return GURL(url_string);
 }
 
 void SelectFileDialogImpl::FileBrowseDelegate::GetWebUIMessageHandlers(
@@ skipping 123 matching lines @@
     // TODO(xiyuan): Change this when the infrastructure is improved.
     HtmlDialogUIDelegate** delegate = HtmlDialogUI::GetPropertyAccessor().
         GetProperty(web_ui_->tab_contents()->property_bag());
     HtmlDialogView* containing_view = static_cast<HtmlDialogView*>(*delegate);
     DCHECK(containing_view);
 
     containing_view->GetWindow()->UpdateWindowTitle();
     containing_view->GetWindow()->non_client_view()->SchedulePaint();
   }
 }