win: wstring->string16 in chrome/installer/util/html_dialog

chrome/installer/util/html_dialog_impl.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 <windows.h>
 #include <mshtmhst.h>
 #include <urlmon.h>
 
 #include "base/win/scoped_variant.h"
 #include "chrome/installer/util/html_dialog.h"
@@ skipping 22 matching lines @@
 //    window.returnValue = 2;  <-- this matches HTML_DLG_DECLINE
 //  }
 //  window.close();
 // }
 //
 // Note that on the submit handler you need to set window.returnValue to one of
 // the values of DialogResult and call window.close().
 
 class HTMLDialogWin : public HTMLDialog {
  public:
-  HTMLDialogWin(const std::wstring& url, const std::wstring& param)
+  HTMLDialogWin(const base::string16& url, const base::string16& param)
       : url_(url), param_(param) {
     if (!mshtml_)
        mshtml_ = LoadLibrary(L"MSHTML.DLL");
   }
 
   DialogResult ShowModal(void* parent_window,
                          CustomizationCallback* callback) override {
     int result = HTML_DLG_DECLINE;
     if (!InternalDoDialog(callback, &result))
       return HTML_DLG_ERROR;
     return static_cast<DialogResult>(result);
   }
 
-  std::wstring GetExtraResult() override { return extra_result_; }
+  base::string16 GetExtraResult() override { return extra_result_; }
 
  private:
   bool InternalDoDialog(CustomizationCallback* callback, int* result);
   static LRESULT CALLBACK MsgFilter(int code, WPARAM wParam, LPARAM lParam);
 
-  std::wstring url_;
-  std::wstring param_;
+  base::string16 url_;
+  base::string16 param_;
   static HHOOK hook_;
   static HINSTANCE mshtml_;
   static CustomizationCallback* callback_;
-  std::wstring extra_result_;
+  base::string16 extra_result_;
 };
 
-HTMLDialog* CreateNativeHTMLDialog(const std::wstring& url,
-                                   const std::wstring& param) {
+HTMLDialog* CreateNativeHTMLDialog(const base::string16& url,
+                                   const base::string16& param) {
   return new HTMLDialogWin(url, param);
 }
 
 HHOOK HTMLDialogWin::hook_ = NULL;
 HINSTANCE HTMLDialogWin::mshtml_ = NULL;
 HTMLDialogWin::CustomizationCallback* HTMLDialogWin::callback_ = NULL;
 
 // This hook function gets called for messages bound to the windows that
 // ShowHTMLDialog creates. We tell apart the top window because it has the
 // system menu style.
@@ skipping 81 matching lines @@
   if (!window)
     return;
   HWND top_window = static_cast<HWND>(window);
   LONG_PTR style = ::GetWindowLongPtrW(top_window, GWL_STYLE);
   ::SetWindowLongPtrW(top_window, GWL_STYLE, style & ~WS_SYSMENU);
   HICON ico = ::LoadIcon(NULL, IDI_INFORMATION);
   ::SendMessageW(top_window, WM_SETICON, ICON_SMALL,
                  reinterpret_cast<LPARAM>(ico));
 }
 
-EulaHTMLDialog::EulaHTMLDialog(const std::wstring& file,
-                               const std::wstring& param) {
+EulaHTMLDialog::EulaHTMLDialog(const base::string16& file,
+                               const base::string16& param) {
   dialog_ = CreateNativeHTMLDialog(file, param);
 }
 
 EulaHTMLDialog::~EulaHTMLDialog() {
   delete dialog_;
 }
 
 EulaHTMLDialog::Outcome EulaHTMLDialog::ShowModal() {
   Customizer customizer;
   HTMLDialog::DialogResult dr = dialog_->ShowModal(NULL, &customizer);
   if (HTMLDialog::HTML_DLG_ACCEPT == dr)
     return EulaHTMLDialog::ACCEPTED;
   else if (HTMLDialog::HTML_DLG_EXTRA == dr)
     return EulaHTMLDialog::ACCEPTED_OPT_IN;
   else
     return EulaHTMLDialog::REJECTED;
 }
 
 }  // namespace installer