Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2892)

Unified Diff: chrome/browser/chrome_browser_main_win.cc

Issue 11417036: Fix user-level Chrome self-destruction issues on Windows 8. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/installer/setup/uninstall.cc » ('j') | chrome/installer/setup/uninstall.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main_win.cc
diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc
index 10ed28d3807543761ded08f6d77fd3101b70667a..afff87c18f13e659b266e51557cab917967867c5 100644
--- a/chrome/browser/chrome_browser_main_win.cc
+++ b/chrome/browser/chrome_browser_main_win.cc
@@ -361,18 +361,15 @@ bool ChromeBrowserMainPartsWin::CheckMachineLevelInstall() {
std::wstring exe = exe_path.value();
FilePath user_exe_path(installer::GetChromeInstallPath(false, dist));
if (FilePath::CompareEqualIgnoreCase(exe, user_exe_path.value())) {
- const string16 text =
- l10n_util::GetStringUTF16(IDS_MACHINE_LEVEL_INSTALL_CONFLICT);
- const string16 caption = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
- const UINT flags = MB_OK | MB_ICONERROR | MB_TOPMOST;
- ui::MessageBox(NULL, text, caption, flags);
robertshield 2012/11/16 20:23:33 Let's only remove this on Win8/metro for now. We c
grt (UTC plus 2) 2012/11/16 21:11:24 what he said.
gab 2012/11/20 00:46:36 Done.
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);
- base::LaunchProcess(uninstall_cmd, base::LaunchOptions(), NULL);
+ base::LaunchOptions launch_options;
+ launch_options.force_breakaway_from_job_ = true;
+ base::LaunchProcess(uninstall_cmd, launch_options, NULL);
}
return true;
}
« no previous file with comments | « no previous file | chrome/installer/setup/uninstall.cc » ('j') | chrome/installer/setup/uninstall.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698