diff options
| author | sidor@chromium.org <sidor@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-10 07:54:50 +0000 |
|---|---|---|
| committer | sidor@chromium.org <sidor@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-10 07:54:50 +0000 |
| commit | 80722b2de9e24617450c1727b4aa619ca5f8709d (patch) | |
| tree | 824cf99f86da8f5c8de98cee1f0139be84d314bd /chrome/browser/notifications/notification_ui_manager.cc | |
| parent | 49a9c05b2eafc9b4ed09f9e7b54c8a3a1a269afe (diff) | |
| download | chromium_src-80722b2de9e24617450c1727b4aa619ca5f8709d.zip chromium_src-80722b2de9e24617450c1727b4aa619ca5f8709d.tar.gz chromium_src-80722b2de9e24617450c1727b4aa619ca5f8709d.tar.bz2 | |
Fixing the bug, that caused UI to hang after unsupported device was inserted.
In the idle.h new synchronous method was added - IsWorkstationInLockedState.
BUG=chromium-os:20261
TEST=None
Review URL: http://codereview.chromium.org/7864022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100582 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications/notification_ui_manager.cc')
| -rw-r--r-- | chrome/browser/notifications/notification_ui_manager.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/notifications/notification_ui_manager.cc b/chrome/browser/notifications/notification_ui_manager.cc index f4ed3d8..968d903 100644 --- a/chrome/browser/notifications/notification_ui_manager.cc +++ b/chrome/browser/notifications/notification_ui_manager.cc @@ -152,8 +152,7 @@ void NotificationUIManager::CheckAndShowNotifications() { void NotificationUIManager::CheckUserState() { bool is_user_active_previously = is_user_active_; - is_user_active_ = CalculateIdleStateSync(0) != IDLE_STATE_LOCKED && - !IsFullScreenMode(); + is_user_active_ = !CheckIdleStateIsLocked() && !IsFullScreenMode(); if (is_user_active_ == is_user_active_previously) return; |