Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Unified Diff: chrome/installer/util/html_dialog_impl.cc

Issue 1115063002: win: wstring->string16 in chrome/installer/util/html_dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/installer/util/html_dialog.h ('K') | « chrome/installer/util/html_dialog.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/html_dialog_impl.cc
diff --git a/chrome/installer/util/html_dialog_impl.cc b/chrome/installer/util/html_dialog_impl.cc
index 679aa74fee98a0add05dda86bee1bc94edac702f..73763596def30a54885b6d8e5d0a7b8c919b1366 100644
--- a/chrome/installer/util/html_dialog_impl.cc
+++ b/chrome/installer/util/html_dialog_impl.cc
@@ -40,7 +40,7 @@ namespace installer {
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");
@@ -54,22 +54,22 @@ class HTMLDialogWin : public HTMLDialog {
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);
}
@@ -171,8 +171,8 @@ void EulaHTMLDialog::Customizer::OnBeforeDisplay(void* window) {
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);
}
« chrome/installer/util/html_dialog.h ('K') | « chrome/installer/util/html_dialog.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698