summaryrefslogtreecommitdiffstats
path: root/chrome/browser/web_applications
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-24 03:49:01 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-24 03:49:01 +0000
commit08729cc56a5177d795ada1723ea1bf70557df0ee (patch)
treea056473e78c206403b53489913559cf92b3736bc /chrome/browser/web_applications
parent0556cfbcf7cb03445a628d6b71a9536f762cc3c3 (diff)
downloadchromium_src-08729cc56a5177d795ada1723ea1bf70557df0ee.zip
chromium_src-08729cc56a5177d795ada1723ea1bf70557df0ee.tar.gz
chromium_src-08729cc56a5177d795ada1723ea1bf70557df0ee.tar.bz2
Use FilePath::DirName instead of the deprecated file_util::GetDirectoryFromPath.
BUG=24672 TEST=compiles Review URL: http://codereview.chromium.org/2110021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48014 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/web_applications')
-rw-r--r--chrome/browser/web_applications/web_app.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc
index 0674c0d..d84ad67 100644
--- a/chrome/browser/web_applications/web_app.cc
+++ b/chrome/browser/web_applications/web_app.cc
@@ -355,14 +355,14 @@ bool CreateShortcutTask::CreateShortcut() {
return false;
}
- std::wstring chrome_exe;
+ FilePath chrome_exe;
if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
NOTREACHED();
return false;
}
// Working directory.
- std::wstring chrome_folder = file_util::GetDirectoryFromPath(chrome_exe);
+ FilePath chrome_folder = chrome_exe.DirName();
std::string switches =
ShellIntegration::GetCommandLineArgumentsCommon(shortcut_info_.url,
@@ -393,9 +393,9 @@ bool CreateShortcutTask::CreateShortcut() {
download_util::AppendNumberToPath(&shortcut_file, unique_number);
}
- success &= file_util::CreateShortcutLink(chrome_exe.c_str(),
+ success &= file_util::CreateShortcutLink(chrome_exe.value().c_str(),
shortcut_file.value().c_str(),
- chrome_folder.c_str(),
+ chrome_folder.value().c_str(),
wide_switchs.c_str(),
shortcut_info_.description.c_str(),
icon_file.value().c_str(),