chrome/browser/notifications/notification_ui_manager.cc - Issue 7864022: Fixing the bug, that caused UI to hang after unsupported device was inserted.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: style 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..968d903f39aec6fbe8e95475d531744a3f436134 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;

« no previous file with comments | « chrome/browser/idle_win.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »