From 83ab5f200ee5c9601bfa60d1786f99c77ff1a88a Mon Sep 17 00:00:00 2001 From: "johnnyg@chromium.org" Date: Thu, 12 Nov 2009 22:43:52 +0000 Subject: Notifications permission infobar should only be shown in response to a user gesture, not arbitrary script. Includes UI test which verify the infobar is shown from a gesture, and not shown from raw script. BUG=27215 TEST=included Review URL: http://codereview.chromium.org/387011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31839 0039d316-1c4b-4281-b951-d872f2087c98 --- .../desktop_notifications/active_notification_tracker.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'chrome/common/desktop_notifications/active_notification_tracker.cc') diff --git a/chrome/common/desktop_notifications/active_notification_tracker.cc b/chrome/common/desktop_notifications/active_notification_tracker.cc index 3357ab3..d3d50cd 100644 --- a/chrome/common/desktop_notifications/active_notification_tracker.cc +++ b/chrome/common/desktop_notifications/active_notification_tracker.cc @@ -13,7 +13,7 @@ using WebKit::WebNotificationPermissionCallback; bool ActiveNotificationTracker::GetId( const WebNotification& notification, int& id) { - DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_UI); + DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_DEFAULT); ReverseTable::iterator iter = reverse_notification_table_.find(notification); if (iter == reverse_notification_table_.end()) return false; @@ -23,7 +23,7 @@ bool ActiveNotificationTracker::GetId( bool ActiveNotificationTracker::GetNotification( int id, WebNotification* notification) { - DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_UI); + DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_DEFAULT); WebNotification* lookup = notification_table_.Lookup(id); if (!lookup) return false; @@ -34,7 +34,7 @@ bool ActiveNotificationTracker::GetNotification( int ActiveNotificationTracker::RegisterNotification( const WebKit::WebNotification& proxy) { - DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_UI); + DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_DEFAULT); WebNotification* notification = new WebNotification(proxy); int id = notification_table_.Add(notification); reverse_notification_table_[proxy] = id; @@ -42,7 +42,7 @@ int ActiveNotificationTracker::RegisterNotification( } void ActiveNotificationTracker::UnregisterNotification(int id) { - DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_UI); + DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_DEFAULT); // We want to free the notification after removing it from the table. scoped_ptr notification(notification_table_.Lookup(id)); notification_table_.Remove(id); @@ -53,17 +53,17 @@ void ActiveNotificationTracker::UnregisterNotification(int id) { WebNotificationPermissionCallback* ActiveNotificationTracker::GetCallback( int id) { - DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_UI); + DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_DEFAULT); return callback_table_.Lookup(id); } int ActiveNotificationTracker::RegisterPermissionRequest( WebNotificationPermissionCallback* callback) { - DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_UI); + DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_DEFAULT); return callback_table_.Add(callback); } void ActiveNotificationTracker::OnPermissionRequestComplete(int id) { - DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_UI); + DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_DEFAULT); callback_table_.Remove(id); } -- cgit v1.1