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

Unified Diff: sandbox/win/sandbox_poc/main_ui_window.cc

Issue 109843003: Replace wstring with string16 in sandbox (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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
« no previous file with comments | « sandbox/win/sandbox_poc/main_ui_window.h ('k') | sandbox/win/sandbox_poc/pocdll/spyware.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sandbox/win/sandbox_poc/main_ui_window.cc
diff --git a/sandbox/win/sandbox_poc/main_ui_window.cc b/sandbox/win/sandbox_poc/main_ui_window.cc
index 4d7c13a2663341a05f0d988ebacfa66d6bdabe49..243075c0497e92c0c8dd37cd77464794bc9d9339 100644
--- a/sandbox/win/sandbox_poc/main_ui_window.cc
+++ b/sandbox/win/sandbox_poc/main_ui_window.cc
@@ -174,8 +174,8 @@ INT_PTR CALLBACK MainUIWindow::SpawnTargetWndProc(HWND dialog,
HWND edit_box_dll_name = ::GetDlgItem(dialog, IDC_DLL_NAME);
wchar_t current_dir[MAX_PATH];
if (GetCurrentDirectory(MAX_PATH, current_dir)) {
- std::wstring dll_path = std::wstring(current_dir) +
- std::wstring(kDefaultDll_);
+ base::string16 dll_path = base::string16(current_dir) +
+ base::string16(kDefaultDll_);
::SetWindowText(edit_box_dll_name, dll_path.c_str());
}
@@ -204,7 +204,7 @@ INT_PTR CALLBACK MainUIWindow::SpawnTargetWndProc(HWND dialog,
return static_cast<INT_PTR>(TRUE);
} else if (LOWORD(wparam) == IDC_BROWSE_DLL) {
// If the user presses the Browse button to look for a DLL
- std::wstring dll_path = host->OnShowBrowseForDllDlg(dialog);
+ base::string16 dll_path = host->OnShowBrowseForDllDlg(dialog);
if (dll_path.length() > 0) {
// Initialize the window text for Log File edit box
HWND edit_box_dll_path = ::GetDlgItem(dialog, IDC_DLL_NAME);
@@ -213,7 +213,7 @@ INT_PTR CALLBACK MainUIWindow::SpawnTargetWndProc(HWND dialog,
return static_cast<INT_PTR>(TRUE);
} else if (LOWORD(wparam) == IDC_BROWSE_LOG) {
// If the user presses the Browse button to look for a log file
- std::wstring log_path = host->OnShowBrowseForLogFileDlg(dialog);
+ base::string16 log_path = host->OnShowBrowseForLogFileDlg(dialog);
if (log_path.length() > 0) {
// Initialize the window text for Log File edit box
HWND edit_box_log_file = ::GetDlgItem(dialog, IDC_LOG_FILE);
@@ -354,7 +354,7 @@ bool MainUIWindow::OnLaunchDll(HWND dialog) {
}
// store these values in the member variables for use in SpawnTarget
- log_file_ = std::wstring(L"\"") + log_file + std::wstring(L"\"");
+ log_file_ = base::string16(L"\"") + log_file + base::string16(L"\"");
dll_path_ = dll_path;
entry_point_ = entry_point;
@@ -575,7 +575,7 @@ bool MainUIWindow::SpawnTarget() {
return return_value;
}
-std::wstring MainUIWindow::OnShowBrowseForDllDlg(HWND owner) {
+base::string16 MainUIWindow::OnShowBrowseForDllDlg(HWND owner) {
wchar_t filename[MAX_PATH];
wcscpy_s(filename, MAX_PATH, L"");
@@ -595,7 +595,7 @@ std::wstring MainUIWindow::OnShowBrowseForDllDlg(HWND owner) {
return L"";
}
-std::wstring MainUIWindow::OnShowBrowseForLogFileDlg(HWND owner) {
+base::string16 MainUIWindow::OnShowBrowseForLogFileDlg(HWND owner) {
wchar_t filename[MAX_PATH];
wcscpy_s(filename, MAX_PATH, L"");
« no previous file with comments | « sandbox/win/sandbox_poc/main_ui_window.h ('k') | sandbox/win/sandbox_poc/pocdll/spyware.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698