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

Side by Side Diff: chrome/browser/push_messaging/push_messaging_permission_context.cc

Issue 1943963004: Revert of (reland) Move permission.mojom from WebKit/public/platform/ to components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 unified diff | Download patch
OLDNEW
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/permissions/permission_manager.h" 8 #include "chrome/browser/permissions/permission_manager.h"
9 #include "chrome/browser/permissions/permission_request_id.h" 9 #include "chrome/browser/permissions/permission_request_id.h"
10 #include "chrome/browser/permissions/permission_uma_util.h" 10 #include "chrome/browser/permissions/permission_uma_util.h"
(...skipping 22 matching lines...) Expand all
33 // 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
34 // should try to remove this quirk. 34 // should try to remove this quirk.
35 #if defined(ENABLE_NOTIFICATIONS) 35 #if defined(ENABLE_NOTIFICATIONS)
36 if (requesting_origin != embedding_origin) 36 if (requesting_origin != embedding_origin)
37 return CONTENT_SETTING_BLOCK; 37 return CONTENT_SETTING_BLOCK;
38 38
39 ContentSetting push_content_setting = 39 ContentSetting push_content_setting =
40 PermissionContextBase::GetPermissionStatus(requesting_origin, 40 PermissionContextBase::GetPermissionStatus(requesting_origin,
41 embedding_origin); 41 embedding_origin);
42 42
43 permissions::mojom::PermissionStatus notifications_permission = 43 blink::mojom::PermissionStatus notifications_permission =
44 PermissionManager::Get(profile_)->GetPermissionStatus( 44 PermissionManager::Get(profile_)->GetPermissionStatus(
45 content::PermissionType::NOTIFICATIONS, requesting_origin, 45 content::PermissionType::NOTIFICATIONS, requesting_origin,
46 embedding_origin); 46 embedding_origin);
47 47
48 if (notifications_permission == 48 if (notifications_permission == blink::mojom::PermissionStatus::DENIED ||
49 permissions::mojom::PermissionStatus::DENIED ||
50 push_content_setting == CONTENT_SETTING_BLOCK) { 49 push_content_setting == CONTENT_SETTING_BLOCK) {
51 return CONTENT_SETTING_BLOCK; 50 return CONTENT_SETTING_BLOCK;
52 } 51 }
53 if (notifications_permission == permissions::mojom::PermissionStatus::ASK) 52 if (notifications_permission == blink::mojom::PermissionStatus::ASK)
54 return CONTENT_SETTING_ASK; 53 return CONTENT_SETTING_ASK;
55 54
56 DCHECK(push_content_setting == CONTENT_SETTING_ALLOW || 55 DCHECK(push_content_setting == CONTENT_SETTING_ALLOW ||
57 push_content_setting == CONTENT_SETTING_ASK); 56 push_content_setting == CONTENT_SETTING_ASK);
58 57
59 // If the notifications permission has already been granted, 58 // If the notifications permission has already been granted,
60 // and the push permission isn't explicitly blocked, then grant 59 // and the push permission isn't explicitly blocked, then grant
61 // allow permission. 60 // allow permission.
62 return CONTENT_SETTING_ALLOW; 61 return CONTENT_SETTING_ALLOW;
63 #else 62 #else
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 98
100 bool PushMessagingPermissionContext::IsRestrictedToSecureOrigins() const { 99 bool PushMessagingPermissionContext::IsRestrictedToSecureOrigins() const {
101 return true; 100 return true;
102 } 101 }
103 102
104 void PushMessagingPermissionContext::DecidePushPermission( 103 void PushMessagingPermissionContext::DecidePushPermission(
105 const PermissionRequestID& id, 104 const PermissionRequestID& id,
106 const GURL& requesting_origin, 105 const GURL& requesting_origin,
107 const GURL& embedding_origin, 106 const GURL& embedding_origin,
108 const BrowserPermissionCallback& callback, 107 const BrowserPermissionCallback& callback,
109 permissions::mojom::PermissionStatus notification_status) { 108 blink::mojom::PermissionStatus notification_status) {
110 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 109 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
111 DCHECK_NE(notification_status, permissions::mojom::PermissionStatus::ASK); 110 DCHECK_NE(notification_status, blink::mojom::PermissionStatus::ASK);
112 111
113 ContentSetting push_content_setting = 112 ContentSetting push_content_setting =
114 HostContentSettingsMapFactory::GetForProfile(profile_) 113 HostContentSettingsMapFactory::GetForProfile(profile_)
115 ->GetContentSettingAndMaybeUpdateLastUsage( 114 ->GetContentSettingAndMaybeUpdateLastUsage(
116 requesting_origin, embedding_origin, content_settings_type(), 115 requesting_origin, embedding_origin, content_settings_type(),
117 std::string()); 116 std::string());
118 117
119 if (push_content_setting == CONTENT_SETTING_BLOCK) { 118 if (push_content_setting == CONTENT_SETTING_BLOCK) {
120 DVLOG(1) << "Push permission was explicitly blocked."; 119 DVLOG(1) << "Push permission was explicitly blocked.";
121 PermissionUmaUtil::PermissionDenied(permission_type(), requesting_origin); 120 PermissionUmaUtil::PermissionDenied(permission_type(), requesting_origin);
122 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, 121 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
123 true /* persist */, CONTENT_SETTING_BLOCK); 122 true /* persist */, CONTENT_SETTING_BLOCK);
124 return; 123 return;
125 } 124 }
126 125
127 if (notification_status == permissions::mojom::PermissionStatus::DENIED) { 126 if (notification_status == blink::mojom::PermissionStatus::DENIED) {
128 DVLOG(1) << "Notification permission has not been granted."; 127 DVLOG(1) << "Notification permission has not been granted.";
129 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, 128 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
130 false /* persist */, CONTENT_SETTING_BLOCK); 129 false /* persist */, CONTENT_SETTING_BLOCK);
131 return; 130 return;
132 } 131 }
133 132
134 PermissionUmaUtil::PermissionGranted(permission_type(), requesting_origin); 133 PermissionUmaUtil::PermissionGranted(permission_type(), requesting_origin);
135 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, 134 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
136 true /* persist */, CONTENT_SETTING_ALLOW); 135 true /* persist */, CONTENT_SETTING_ALLOW);
137 } 136 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698