diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-11 16:30:43 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-11 16:30:43 +0000 |
| commit | e5fbd49658f20cff9e1f3894f059b44e003797ad (patch) | |
| tree | d193e183eea36234c759889e3153dab62d4185d5 /chrome/browser/browser_main_win.cc | |
| parent | 43f8cafcda59410d35c274c2866cd17a81a1fd3b (diff) | |
| download | chromium_src-e5fbd49658f20cff9e1f3894f059b44e003797ad.zip chromium_src-e5fbd49658f20cff9e1f3894f059b44e003797ad.tar.gz chromium_src-e5fbd49658f20cff9e1f3894f059b44e003797ad.tar.bz2 | |
Fix user-to-system-level installation delegation. This looks to have been broken since r66096.
BUG=72620
TEST=Install user level Chrome then system level Chrome. Observer that user level Chrome removes itself and delegates to system level.
Review URL: http://codereview.chromium.org/6490008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74609 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main_win.cc')
| -rw-r--r-- | chrome/browser/browser_main_win.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc index 6616894..cf5e783 100644 --- a/chrome/browser/browser_main_win.cc +++ b/chrome/browser/browser_main_win.cc @@ -194,9 +194,9 @@ bool CheckMachineLevelInstall() { const string16 caption = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); const UINT flags = MB_OK | MB_ICONERROR | MB_TOPMOST; ui::MessageBox(NULL, text, caption, flags); - FilePath uninstall_path(InstallUtil::GetChromeUninstallCmd(false, dist)); - CommandLine uninstall_cmd(uninstall_path); - if (!uninstall_cmd.GetProgram().value().empty()) { + CommandLine uninstall_cmd( + InstallUtil::GetChromeUninstallCmd(false, dist->GetType())); + if (!uninstall_cmd.GetProgram().empty()) { uninstall_cmd.AppendSwitch(installer::switches::kForceUninstall); uninstall_cmd.AppendSwitch( installer::switches::kDoNotRemoveSharedItems); |