Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3011)

Unified Diff: chrome/browser/notifications/notification_ui_manager.cc

Issue 7864022: Fixing the bug, that caused UI to hang after unsupported device was inserted. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: small fixes Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/notifications/notification_ui_manager.cc
diff --git a/chrome/browser/notifications/notification_ui_manager.cc b/chrome/browser/notifications/notification_ui_manager.cc
index f4ed3d83ad8c1de4c2496b53a0c942cc7a8694fd..41a870966580e0cc1b526d346da5ed17e9431ac5 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_ = !IsWorkstationInLockedState() && !IsFullScreenMode();
if (is_user_active_ == is_user_active_previously)
return;

Powered by Google App Engine
This is Rietveld 408576698