diff options
| author | grt <grt@chromium.org> | 2014-12-05 08:42:10 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-05 16:42:38 +0000 |
| commit | e76ca28508f7cbc956b789d971132f7c73e33ec3 (patch) | |
| tree | 5438e6c62c92b1f0c0b46ded806f4b8eb8f18103 /win8 | |
| parent | c6616f79031316e3a2c5518df7333131d1496333 (diff) | |
| download | chromium_src-e76ca28508f7cbc956b789d971132f7c73e33ec3.zip chromium_src-e76ca28508f7cbc956b789d971132f7c73e33ec3.tar.gz chromium_src-e76ca28508f7cbc956b789d971132f7c73e33ec3.tar.bz2 | |
Use FilePath in favor of string16 and wchar_t* in some Windows installer code.
The changes trickle through the DLL loader as well.
BUG=24672
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/775383002
Cr-Commit-Position: refs/heads/master@{#307034}
Diffstat (limited to 'win8')
| -rw-r--r-- | win8/delegate_execute/chrome_util.cc | 2 | ||||
| -rw-r--r-- | win8/delegate_execute/command_execute_impl.cc | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/win8/delegate_execute/chrome_util.cc b/win8/delegate_execute/chrome_util.cc index e973273..0f85d6dd 100644 --- a/win8/delegate_execute/chrome_util.cc +++ b/win8/delegate_execute/chrome_util.cc @@ -105,7 +105,7 @@ void UpdateChromeIfNeeded(const base::FilePath& chrome_exe) { base::Process process; - if (InstallUtil::IsPerUserInstall(chrome_exe.value().c_str())) { + if (InstallUtil::IsPerUserInstall(chrome_exe)) { // Read the update command from the registry. base::string16 update_command; if (!GetUpdateCommand(true, &update_command)) { diff --git a/win8/delegate_execute/command_execute_impl.cc b/win8/delegate_execute/command_execute_impl.cc index bea3e75..6aca5a1 100644 --- a/win8/delegate_execute/command_execute_impl.cc +++ b/win8/delegate_execute/command_execute_impl.cc @@ -250,8 +250,7 @@ STDMETHODIMP CommandExecuteImpl::Execute() { } BrowserDistribution* distribution = BrowserDistribution::GetDistribution(); - bool is_per_user_install = InstallUtil::IsPerUserInstall( - chrome_exe_.value().c_str()); + bool is_per_user_install = InstallUtil::IsPerUserInstall(chrome_exe_); base::string16 app_id = ShellUtil::GetBrowserModelId( distribution, is_per_user_install); |