diff options
| author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-20 11:37:05 +0000 |
|---|---|---|
| committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-20 11:37:05 +0000 |
| commit | a20cc2b55d3464ab7ae496e831565afd8f531b40 (patch) | |
| tree | 8a1d27a32d9e1129f58e5f72f80d289a574b13ad | |
| parent | 22b8120eca5a05e687d088688081dc2e4b36a5ad (diff) | |
| download | chromium_src-a20cc2b55d3464ab7ae496e831565afd8f531b40.zip chromium_src-a20cc2b55d3464ab7ae496e831565afd8f531b40.tar.gz chromium_src-a20cc2b55d3464ab7ae496e831565afd8f531b40.tar.bz2 | |
[cros] Don't launch new browser session when browser is already shutting down.
BUG=chromium-os:20504
TEST=autotests
Review URL: http://codereview.chromium.org/7951004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101946 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/login/login_utils.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc index cff38a3..52ad35a 100644 --- a/chrome/browser/chromeos/login/login_utils.cc +++ b/chrome/browser/chromeos/login/login_utils.cc @@ -21,6 +21,7 @@ #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" +#include "chrome/browser/browser_shutdown.h" #include "chrome/browser/chromeos/boot_times_loader.h" #include "chrome/browser/chromeos/cros/login_library.h" #include "chrome/browser/chromeos/cros/network_library.h" @@ -1128,6 +1129,9 @@ void LoginUtils::Set(LoginUtils* mock) { void LoginUtils::DoBrowserLaunch(Profile* profile, LoginDisplayHost* login_host) { + if (browser_shutdown::IsTryingToQuit()) + return; + BootTimesLoader::Get()->AddLoginTimeMarker("BrowserLaunched", false); VLOG(1) << "Launching browser..."; |