diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-30 23:56:18 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-30 23:56:18 +0000 |
| commit | b969648e443de8c767d7e2f6b34861b4a1ee3eec (patch) | |
| tree | b41dea85b620d7664038e2583614745bc4be6fae /chrome/browser/shell_integration_win.cc | |
| parent | f0a94b593178cfe95dd16424cca6a0144de0d440 (diff) | |
| download | chromium_src-b969648e443de8c767d7e2f6b34861b4a1ee3eec.zip chromium_src-b969648e443de8c767d7e2f6b34861b4a1ee3eec.tar.gz chromium_src-b969648e443de8c767d7e2f6b34861b4a1ee3eec.tar.bz2 | |
windows: remove PathService::Get() that uses wstrings
This just required fixing the remaining callers.
BUG=24672
Review URL: http://codereview.chromium.org/5356008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67783 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/shell_integration_win.cc')
| -rw-r--r-- | chrome/browser/shell_integration_win.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc index f358ffd..044a787 100644 --- a/chrome/browser/shell_integration_win.cc +++ b/chrome/browser/shell_integration_win.cc @@ -265,7 +265,7 @@ bool MigrateChromiumShortcutsTask::GetShortcutAppId( }; bool ShellIntegration::SetAsDefaultBrowser() { - std::wstring chrome_exe; + FilePath chrome_exe; if (!PathService::Get(base::FILE_EXE, &chrome_exe)) { LOG(ERROR) << "Error getting app exe path"; return false; @@ -273,7 +273,7 @@ bool ShellIntegration::SetAsDefaultBrowser() { // From UI currently we only allow setting default browser for current user. if (!ShellUtil::MakeChromeDefault(ShellUtil::CURRENT_USER, - chrome_exe, true)) { + chrome_exe.value(), true)) { LOG(ERROR) << "Chrome could not be set as default browser."; return false; } @@ -285,7 +285,7 @@ bool ShellIntegration::SetAsDefaultBrowser() { ShellIntegration::DefaultBrowserState ShellIntegration::IsDefaultBrowser() { // First determine the app path. If we can't determine what that is, we have // bigger fish to fry... - std::wstring app_path; + FilePath app_path; if (!PathService::Get(base::FILE_EXE, &app_path)) { LOG(ERROR) << "Error getting app exe path"; return UNKNOWN_DEFAULT_BROWSER; @@ -330,7 +330,8 @@ ShellIntegration::DefaultBrowserState ShellIntegration::IsDefaultBrowser() { pAAR->Release(); } else { std::wstring short_app_path; - GetShortPathName(app_path.c_str(), WriteInto(&short_app_path, MAX_PATH), + GetShortPathName(app_path.value().c_str(), + WriteInto(&short_app_path, MAX_PATH), MAX_PATH); // open command for protocol associations |