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

chrome/installer/util/html_dialog.h

 // 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.
 
 #ifndef CHROME_INSTALLER_UTIL_HTML_DIALOG_H_
 #define CHROME_INSTALLER_UTIL_HTML_DIALOG_H_
 
 #include <string>

[grt (UTC plus 2), 2015/04/30 02:58:29]

remove

[Nico, 2015/04/30 02:59:20]

string16.h includes <string>, but yeah I guess it's a bit nicer. I'll send you a
patch.

 
 #include "base/basictypes.h"
+#include "base/strings/string16.h"
 
 // This is the interface for creating HTML-based Dialogs *before* Chrome has
 // been installed or when there is a suspicion chrome is not working. In
 // other words, the dialogs use another native html rendering engine. In the
 // case of Windows it is the the Internet Explorer control.
 
 namespace installer {
 
 // Interface for implementing a native HTML dialog.
 class HTMLDialog {
@@ skipping 26 matching lines @@
 
   // Shows the HTML in a modal dialog. The buttons and other UI are also done
   // in HTML so each native implementation needs to map the user action into
   // one of the 6 possible results of DialogResult. Important, call this
   // method only from the main (or UI) thread.
   virtual DialogResult ShowModal(void* parent_window,
                                  CustomizationCallback* callback) = 0;
 
   // If the result of ShowModal() was EXTRA, the information is available
   // as a string using this method.
-  virtual std::wstring GetExtraResult() = 0;
+  virtual base::string16 GetExtraResult() = 0;
 };
 
 // Factory method for the native HTML Dialog. When done with the object use
 // regular 'delete' operator to destroy the object. It might choose a
 // different underlying implementation according to the url protocol.
-HTMLDialog* CreateNativeHTMLDialog(const std::wstring& url,
-                                   const std::wstring& param);
+HTMLDialog* CreateNativeHTMLDialog(const base::string16& url,
+                                   const base::string16& param);
 
 // This class leverages HTMLDialog to create a dialog that is suitable
 // for a end-user-agreement modal dialog. The html shows a fairly standard
 // EULA form with the accept and cancel buttons and an optional check box
 // to opt-in for sending usage stats and crash reports.
 class EulaHTMLDialog {
  public:
   // |file| points to an html file on disk or to a resource via res:// spec.
   // |param| is a string that will be passed to the dialog as a parameter via
   //         the window.dialogArguments property.
-  EulaHTMLDialog(const std::wstring& file, const std::wstring& param);
+  EulaHTMLDialog(const base::string16& file, const base::string16& param);
   ~EulaHTMLDialog();
 
   enum Outcome {
     REJECTED,           // Declined EULA, mapped from HTML_DLG_ACCEPT (1).
     ACCEPTED,           // Accepted EULA no opt-in, from HTML_DLG_DECLINE (2).
     ACCEPTED_OPT_IN,    // Accepted EULA and opt-in, from HTML_DLG_EXTRA (6).
   };
 
   // Shows the dialog and blocks for user input. The return value is one of
   // the |Outcome| values and any form of failure maps to REJECTED.
   Outcome ShowModal();
 
  private:
   class Customizer : public HTMLDialog::CustomizationCallback {
    public:
     void OnBeforeCreation(wchar_t** extra) override;
     void OnBeforeDisplay(void* window) override;
   };
 
   HTMLDialog* dialog_;
   DISALLOW_COPY_AND_ASSIGN(EulaHTMLDialog);
 };
 
 }  // namespace installer
 
 #endif  // CHROME_INSTALLER_UTIL_HTML_DIALOG_H_