diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-01 21:54:48 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-01 21:54:48 +0000 |
| commit | 81b2e8e4237e43ba54d450e2b58b0b96eb75bbee (patch) | |
| tree | 449ba4c2e2a8d7bc1adff712b795af53c1f53dda /chrome/installer | |
| parent | 0a6fd4ffd939906dc0a217bc7d4701453c301f22 (diff) | |
| download | chromium_src-81b2e8e4237e43ba54d450e2b58b0b96eb75bbee.zip chromium_src-81b2e8e4237e43ba54d450e2b58b0b96eb75bbee.tar.gz chromium_src-81b2e8e4237e43ba54d450e2b58b0b96eb75bbee.tar.bz2 | |
wstring: use FilePath::value() on Windows to get wstrings
BUG=69467
Review URL: http://codereview.chromium.org/6334030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73350 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/setup/setup_main.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc index 78d641c..5d72757 100644 --- a/chrome/installer/setup/setup_main.cc +++ b/chrome/installer/setup/setup_main.cc @@ -150,7 +150,7 @@ installer::InstallStatus RenameChromeExecutables( install_list->AddCopyTreeWorkItem(chrome_new_exe.value(), chrome_exe.value(), - temp_path.ToWStringHack(), + temp_path.value(), WorkItem::IF_DIFFERENT, std::wstring()); install_list->AddDeleteTreeWorkItem(chrome_new_exe); @@ -642,7 +642,7 @@ installer::InstallStatus InstallProducts( // this, if we fail to delete the temp folders, then schedule them for // deletion at next reboot. if (!cleanup_success) { - ScheduleDirectoryForDeletion(temp_path.ToWStringHack().c_str()); + ScheduleDirectoryForDeletion(temp_path.value().c_str()); if (cmd_line.HasSwitch(installer::switches::kInstallerData)) { std::wstring prefs_path = cmd_line.GetSwitchValueNative( installer::switches::kInstallerData); @@ -740,7 +740,7 @@ bool HandleNonInstallCmdLineOptions(const InstallationState& original_state, installer::switches::kUpdateSetupExe); VLOG(1) << "Opening archive " << setup_patch; std::wstring uncompressed_patch; - if (LzmaUtil::UnPackArchive(setup_patch, temp_path.ToWStringHack(), + if (LzmaUtil::UnPackArchive(setup_patch, temp_path.value(), &uncompressed_patch) == NO_ERROR) { FilePath old_setup_exe = cmd_line.GetProgram(); FilePath new_setup_exe = cmd_line.GetSwitchValuePath( @@ -988,7 +988,7 @@ google_breakpad::ExceptionHandler* InitializeCrashReporting( google_breakpad::ExceptionHandler* breakpad = new google_breakpad::ExceptionHandler( - temp_directory.ToWStringHack(), NULL, NULL, NULL, + temp_directory.value(), NULL, NULL, NULL, google_breakpad::ExceptionHandler::HANDLER_ALL, kLargerDumpType, pipe_name.c_str(), GetCustomInfo(exe_path)); return breakpad; |