summaryrefslogtreecommitdiffstats
path: root/chrome/installer/setup
diff options
context:
space:
mode:
authorrahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-08 19:27:45 +0000
committerrahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-08 19:27:45 +0000
commitc6e66b5f5dbba15f0ba19c7773a3105646a02159 (patch)
tree21f5ef2972ca606881c94d4725a8629f8578afe4 /chrome/installer/setup
parentdc6ee2482d239e37b1fb7e0619df2c058ce91bfd (diff)
downloadchromium_src-c6e66b5f5dbba15f0ba19c7773a3105646a02159.zip
chromium_src-c6e66b5f5dbba15f0ba19c7773a3105646a02159.tar.gz
chromium_src-c6e66b5f5dbba15f0ba19c7773a3105646a02159.tar.bz2
Uninstall sometimes leaves behind an empty application directory. Fix is to not use Application directory as target directory for shortcut.
BUG=1315253 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@583 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup')
-rw-r--r--chrome/installer/setup/setup.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/installer/setup/setup.cc b/chrome/installer/setup/setup.cc
index 2c43c90..f36f58b 100644
--- a/chrome/installer/setup/setup.cc
+++ b/chrome/installer/setup/setup.cc
@@ -196,9 +196,10 @@ bool CreateOrUpdateChromeShortcuts(const std::wstring& exe_path,
std::wstring arguments(L" --");
arguments.append(installer_util::switches::kUninstall);
LOG(INFO) << "Creating/updating uninstall link at " << uninstall_link;
+ std::wstring target_folder = file_util::GetDirectoryFromPath(install_path);
ret2 = file_util::CreateShortcutLink(setup_exe.c_str(),
uninstall_link.c_str(),
- install_path.c_str(),
+ target_folder.c_str(),
arguments.c_str(),
NULL,
setup_exe.c_str(),