Index: trunk/src/chrome/browser/chrome_browser_main_win.cc |
=================================================================== |
--- trunk/src/chrome/browser/chrome_browser_main_win.cc (revision 285705) |
+++ trunk/src/chrome/browser/chrome_browser_main_win.cc (working copy) |
@@ -38,6 +38,7 @@ |
#include "chrome/common/chrome_switches.h" |
#include "chrome/common/chrome_version_info.h" |
#include "chrome/common/env_vars.h" |
+#include "chrome/installer/launcher_support/chrome_launcher_support.h" |
#include "chrome/installer/util/browser_distribution.h" |
#include "chrome/installer/util/helper.h" |
#include "chrome/installer/util/install_util.h" |
@@ -118,7 +119,9 @@ |
ShowCloseBrowserFirstMessageBox(); |
return chrome::RESULT_CODE_UNINSTALL_CHROME_ALIVE; |
} |
- int result = chrome::ShowUninstallBrowserPrompt(); |
+ int result = chrome::ShowUninstallBrowserPrompt( |
+ !chrome_launcher_support::IsAppLauncherPresent()); |
+ // Don't offer to delete the profile if the App Launcher is also installed. |
if (browser_util::IsBrowserAlreadyRunning()) { |
ShowCloseBrowserFirstMessageBox(); |
return chrome::RESULT_CODE_UNINSTALL_CHROME_ALIVE; |