diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 14:36:36 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 14:36:36 +0000 |
| commit | 72cafc14c68ef07abd211b702962eaf185d8cbf1 (patch) | |
| tree | b50e4ac27085bb50fbd34a90d37bfa9aa4d9f3c1 /chrome/browser/first_run | |
| parent | c713c3d3bd1430474f77424dd0b251d3b106a4a5 (diff) | |
| download | chromium_src-72cafc14c68ef07abd211b702962eaf185d8cbf1.zip chromium_src-72cafc14c68ef07abd211b702962eaf185d8cbf1.tar.gz chromium_src-72cafc14c68ef07abd211b702962eaf185d8cbf1.tar.bz2 | |
Disable startup-time in-use update finalization in metro mode.
Chrome can't relaunch itself into metro mode at the moment, so don't try.
BUG=125434
TEST=Run chrome, install an update, kill chrome. Now launch chrome in metro mode. This should result in a usable Chrome w/ no zombies.
Review URL: https://chromiumcodereview.appspot.com/10543131
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141888 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/first_run')
| -rw-r--r-- | chrome/browser/first_run/upgrade_util_win.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/first_run/upgrade_util_win.cc b/chrome/browser/first_run/upgrade_util_win.cc index 07aff99..88c5d7e 100644 --- a/chrome/browser/first_run/upgrade_util_win.cc +++ b/chrome/browser/first_run/upgrade_util_win.cc @@ -16,6 +16,7 @@ #include "base/path_service.h" #include "base/process_util.h" #include "base/string_util.h" +#include "base/win/metro.h" #include "base/win/registry.h" #include "base/win/scoped_comptr.h" #include "chrome/browser/first_run/upgrade_util_win.h" @@ -142,6 +143,11 @@ bool SwapNewChromeExeIfPresent() { } bool DoUpgradeTasks(const CommandLine& command_line) { + // The DelegateExecute verb handler finalizes pending in-use updates for + // metro mode launches, as Chrome cannot be gracefully relaunched when + // running in this mode. + if (base::win::GetMetroModule()) + return false; if (!SwapNewChromeExeIfPresent()) return false; // At this point the chrome.exe has been swapped with the new one. |