diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-22 17:16:02 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-22 17:16:02 +0000 |
| commit | 914ace64b1fd1364f9f85abe734fdb7f28dd9483 (patch) | |
| tree | a2ed72bb518da237d78a15f6c8a38e0f8e0d1160 /chrome/browser/upgrade_detector.cc | |
| parent | 6368596b505117f06a8313f6787bfe1d83cbbef0 (diff) | |
| download | chromium_src-914ace64b1fd1364f9f85abe734fdb7f28dd9483.zip chromium_src-914ace64b1fd1364f9f85abe734fdb7f28dd9483.tar.gz chromium_src-914ace64b1fd1364f9f85abe734fdb7f28dd9483.tar.bz2 | |
Don't autorestart if incognito windows are open.
BUG=155489
TEST=Same procedure as when testing the critical notification bubble, except open an incognito window and the bubble should not appear until you close the incognito window.
Review URL: https://codereview.chromium.org/11235028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163315 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/upgrade_detector.cc')
| -rw-r--r-- | chrome/browser/upgrade_detector.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/upgrade_detector.cc b/chrome/browser/upgrade_detector.cc index 5271d9b..a25a547 100644 --- a/chrome/browser/upgrade_detector.cc +++ b/chrome/browser/upgrade_detector.cc @@ -8,6 +8,7 @@ #include "base/command_line.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/lifetime/application_lifetime.h" +#include "chrome/browser/ui/browser_otr_state.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" @@ -103,6 +104,11 @@ void UpgradeDetector::CheckIdle() { } void UpgradeDetector::IdleCallback(IdleState state) { + // Don't proceed while an incognito window is open. The timer will still + // keep firing, so this function will get a chance to re-evaluate this. + if (chrome::IsOffTheRecordSessionActive()) + return; + switch (state) { case IDLE_STATE_LOCKED: // Computer is locked, auto-restart. |