OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/shell/browser/layout_test/layout_test_notification_manager.h" | 5 #include "content/shell/browser/layout_test/layout_test_notification_manager.h" |
6 | 6 |
7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
8 #include "content/public/browser/browser_thread.h" | 8 #include "content/public/browser/browser_thread.h" |
9 #include "content/public/browser/desktop_notification_delegate.h" | 9 #include "content/public/browser/desktop_notification_delegate.h" |
10 #include "content/public/common/show_desktop_notification_params.h" | 10 #include "content/public/common/show_desktop_notification_params.h" |
(...skipping 11 matching lines...) Expand all Loading... |
22 NotificationPermissionMap::iterator iter = | 22 NotificationPermissionMap::iterator iter = |
23 permission_map_.find(origin); | 23 permission_map_.find(origin); |
24 if (iter == permission_map_.end()) | 24 if (iter == permission_map_.end()) |
25 return blink::WebNotificationPermissionDefault; | 25 return blink::WebNotificationPermissionDefault; |
26 | 26 |
27 return iter->second; | 27 return iter->second; |
28 } | 28 } |
29 | 29 |
30 void LayoutTestNotificationManager::RequestPermission( | 30 void LayoutTestNotificationManager::RequestPermission( |
31 const GURL& origin, | 31 const GURL& origin, |
32 const base::Callback<void(blink::WebNotificationPermission)>& callback) { | 32 const base::Callback<void(bool)>& callback) { |
33 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 33 bool allowed = |
34 callback.Run(CheckPermission(origin)); | 34 CheckPermission(origin) == blink::WebNotificationPermissionAllowed; |
| 35 callback.Run(allowed); |
35 } | 36 } |
36 | 37 |
37 void LayoutTestNotificationManager::SetPermission( | 38 void LayoutTestNotificationManager::SetPermission( |
38 const GURL& origin, | 39 const GURL& origin, |
39 blink::WebNotificationPermission permission) { | 40 blink::WebNotificationPermission permission) { |
40 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 41 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
41 permission_map_[origin] = permission; | 42 permission_map_[origin] = permission; |
42 } | 43 } |
43 | 44 |
44 void LayoutTestNotificationManager::ClearPermissions() { | 45 void LayoutTestNotificationManager::ClearPermissions() { |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 void LayoutTestNotificationManager::Close(const std::string& title) { | 94 void LayoutTestNotificationManager::Close(const std::string& title) { |
94 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 95 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
95 auto iterator = notifications_.find(title); | 96 auto iterator = notifications_.find(title); |
96 if (iterator == notifications_.end()) | 97 if (iterator == notifications_.end()) |
97 return; | 98 return; |
98 | 99 |
99 iterator->second->NotificationClosed(false); | 100 iterator->second->NotificationClosed(false); |
100 } | 101 } |
101 | 102 |
102 } // namespace content | 103 } // namespace content |
OLD | NEW |