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 "chrome/browser/push_messaging/push_messaging_permission_context.h" | 5 #include "chrome/browser/push_messaging/push_messaging_permission_context.h" |
6 | 6 |
7 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" | 7 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" |
8 #include "chrome/browser/notifications/notification_permission_context.h" | 8 #include "chrome/browser/permissions/permission_manager.h" |
9 #include "chrome/browser/notifications/notification_permission_context_factory.h
" | |
10 #include "chrome/browser/permissions/permission_request_id.h" | 9 #include "chrome/browser/permissions/permission_request_id.h" |
11 #include "chrome/browser/permissions/permission_uma_util.h" | 10 #include "chrome/browser/permissions/permission_uma_util.h" |
12 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
13 #include "components/content_settings/core/browser/host_content_settings_map.h" | 12 #include "components/content_settings/core/browser/host_content_settings_map.h" |
14 #include "content/public/browser/browser_thread.h" | 13 #include "content/public/browser/browser_thread.h" |
15 #include "content/public/browser/permission_type.h" | 14 #include "content/public/browser/permission_type.h" |
16 #include "content/public/browser/web_contents.h" | 15 #include "content/public/browser/web_contents.h" |
17 #include "content/public/browser/web_contents_delegate.h" | 16 #include "content/public/browser/web_contents_delegate.h" |
18 #include "content/public/common/origin_util.h" | 17 #include "content/public/common/origin_util.h" |
19 | 18 |
(...skipping 14 matching lines...) Expand all Loading... |
34 // TODO(johnme): This is likely to break assumptions made elsewhere, so we | 33 // TODO(johnme): This is likely to break assumptions made elsewhere, so we |
35 // should try to remove this quirk. | 34 // should try to remove this quirk. |
36 #if defined(ENABLE_NOTIFICATIONS) | 35 #if defined(ENABLE_NOTIFICATIONS) |
37 if (requesting_origin != embedding_origin) | 36 if (requesting_origin != embedding_origin) |
38 return CONTENT_SETTING_BLOCK; | 37 return CONTENT_SETTING_BLOCK; |
39 | 38 |
40 ContentSetting push_content_setting = | 39 ContentSetting push_content_setting = |
41 PermissionContextBase::GetPermissionStatus(requesting_origin, | 40 PermissionContextBase::GetPermissionStatus(requesting_origin, |
42 embedding_origin); | 41 embedding_origin); |
43 | 42 |
44 NotificationPermissionContext* notification_context = | 43 blink::mojom::PermissionStatus notifications_permission = |
45 NotificationPermissionContextFactory::GetForProfile(profile_); | 44 PermissionManager::Get(profile_)->GetPermissionStatus( |
46 DCHECK(notification_context); | 45 content::PermissionType::NOTIFICATIONS, requesting_origin, |
| 46 embedding_origin); |
47 | 47 |
48 ContentSetting notifications_permission = | 48 if (notifications_permission == blink::mojom::PermissionStatus::DENIED || |
49 notification_context->GetPermissionStatus(requesting_origin, | |
50 embedding_origin); | |
51 | |
52 if (notifications_permission == CONTENT_SETTING_BLOCK || | |
53 push_content_setting == CONTENT_SETTING_BLOCK) { | 49 push_content_setting == CONTENT_SETTING_BLOCK) { |
54 return CONTENT_SETTING_BLOCK; | 50 return CONTENT_SETTING_BLOCK; |
55 } | 51 } |
56 if (notifications_permission == CONTENT_SETTING_ASK) | 52 if (notifications_permission == blink::mojom::PermissionStatus::ASK) |
57 return CONTENT_SETTING_ASK; | 53 return CONTENT_SETTING_ASK; |
58 | 54 |
59 DCHECK(push_content_setting == CONTENT_SETTING_ALLOW || | 55 DCHECK(push_content_setting == CONTENT_SETTING_ALLOW || |
60 push_content_setting == CONTENT_SETTING_ASK); | 56 push_content_setting == CONTENT_SETTING_ASK); |
61 | 57 |
62 // If the notifications permission has already been granted, | 58 // If the notifications permission has already been granted, |
63 // and the push permission isn't explicitly blocked, then grant | 59 // and the push permission isn't explicitly blocked, then grant |
64 // allow permission. | 60 // allow permission. |
65 return CONTENT_SETTING_ALLOW; | 61 return CONTENT_SETTING_ALLOW; |
66 #else | 62 #else |
(...skipping 14 matching lines...) Expand all Loading... |
81 const GURL& embedding_origin, | 77 const GURL& embedding_origin, |
82 const BrowserPermissionCallback& callback) { | 78 const BrowserPermissionCallback& callback) { |
83 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 79 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
84 #if defined(ENABLE_NOTIFICATIONS) | 80 #if defined(ENABLE_NOTIFICATIONS) |
85 if (requesting_origin != embedding_origin) { | 81 if (requesting_origin != embedding_origin) { |
86 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, | 82 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, |
87 false /* persist */, CONTENT_SETTING_BLOCK); | 83 false /* persist */, CONTENT_SETTING_BLOCK); |
88 return; | 84 return; |
89 } | 85 } |
90 | 86 |
91 NotificationPermissionContext* notification_context = | 87 PermissionManager::Get(profile_)->RequestPermission( |
92 NotificationPermissionContextFactory::GetForProfile(profile_); | 88 content::PermissionType::NOTIFICATIONS, web_contents->GetMainFrame(), |
93 DCHECK(notification_context); | 89 requesting_origin, |
94 | |
95 notification_context->RequestPermission( | |
96 web_contents, id, requesting_origin, | |
97 base::Bind(&PushMessagingPermissionContext::DecidePushPermission, | 90 base::Bind(&PushMessagingPermissionContext::DecidePushPermission, |
98 weak_factory_ui_thread_.GetWeakPtr(), id, requesting_origin, | 91 weak_factory_ui_thread_.GetWeakPtr(), id, requesting_origin, |
99 embedding_origin, callback)); | 92 embedding_origin, callback)); |
100 #else | 93 #else |
101 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, | 94 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, |
102 false /* persist */, CONTENT_SETTING_BLOCK); | 95 false /* persist */, CONTENT_SETTING_BLOCK); |
103 #endif | 96 #endif |
104 } | 97 } |
105 | 98 |
106 bool PushMessagingPermissionContext::IsRestrictedToSecureOrigins() const { | 99 bool PushMessagingPermissionContext::IsRestrictedToSecureOrigins() const { |
107 return true; | 100 return true; |
108 } | 101 } |
109 | 102 |
110 void PushMessagingPermissionContext::DecidePushPermission( | 103 void PushMessagingPermissionContext::DecidePushPermission( |
111 const PermissionRequestID& id, | 104 const PermissionRequestID& id, |
112 const GURL& requesting_origin, | 105 const GURL& requesting_origin, |
113 const GURL& embedding_origin, | 106 const GURL& embedding_origin, |
114 const BrowserPermissionCallback& callback, | 107 const BrowserPermissionCallback& callback, |
115 ContentSetting notification_content_setting) { | 108 blink::mojom::PermissionStatus notification_status) { |
116 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 109 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
| 110 DCHECK_NE(notification_status, blink::mojom::PermissionStatus::ASK); |
| 111 |
117 ContentSetting push_content_setting = | 112 ContentSetting push_content_setting = |
118 HostContentSettingsMapFactory::GetForProfile(profile_) | 113 HostContentSettingsMapFactory::GetForProfile(profile_) |
119 ->GetContentSettingAndMaybeUpdateLastUsage( | 114 ->GetContentSettingAndMaybeUpdateLastUsage( |
120 requesting_origin, embedding_origin, content_settings_type(), | 115 requesting_origin, embedding_origin, content_settings_type(), |
121 std::string()); | 116 std::string()); |
122 | 117 |
123 if (push_content_setting == CONTENT_SETTING_BLOCK) { | 118 if (push_content_setting == CONTENT_SETTING_BLOCK) { |
124 DVLOG(1) << "Push permission was explicitly blocked."; | 119 DVLOG(1) << "Push permission was explicitly blocked."; |
125 PermissionUmaUtil::PermissionDenied(permission_type(), requesting_origin); | 120 PermissionUmaUtil::PermissionDenied(permission_type(), requesting_origin); |
126 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, | 121 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, |
127 true /* persist */, CONTENT_SETTING_BLOCK); | 122 true /* persist */, CONTENT_SETTING_BLOCK); |
128 return; | 123 return; |
129 } | 124 } |
130 | 125 |
131 if (notification_content_setting != CONTENT_SETTING_ALLOW) { | 126 if (notification_status == blink::mojom::PermissionStatus::DENIED) { |
132 DVLOG(1) << "Notification permission has not been granted."; | 127 DVLOG(1) << "Notification permission has not been granted."; |
133 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, | 128 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, |
134 false /* persist */, notification_content_setting); | 129 false /* persist */, CONTENT_SETTING_BLOCK); |
135 return; | 130 return; |
136 } | 131 } |
137 | 132 |
138 PermissionUmaUtil::PermissionGranted(permission_type(), requesting_origin); | 133 PermissionUmaUtil::PermissionGranted(permission_type(), requesting_origin); |
139 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, | 134 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, |
140 true /* persist */, CONTENT_SETTING_ALLOW); | 135 true /* persist */, CONTENT_SETTING_ALLOW); |
141 } | 136 } |
OLD | NEW |