OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/permissions/permission_util.h" | 5 #include "chrome/browser/permissions/permission_util.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" | 8 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" |
9 #include "chrome/browser/permissions/permission_uma_util.h" | 9 #include "chrome/browser/permissions/permission_uma_util.h" |
10 #include "components/content_settings/core/browser/host_content_settings_map.h" | 10 #include "components/content_settings/core/browser/host_content_settings_map.h" |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
93 map->SetContentSettingDefaultScope(primary_url, secondary_url, content_type, | 93 map->SetContentSettingDefaultScope(primary_url, secondary_url, content_type, |
94 resource_identifier, setting); | 94 resource_identifier, setting); |
95 | 95 |
96 ContentSetting final_value = map->GetContentSetting( | 96 ContentSetting final_value = map->GetContentSetting( |
97 primary_url, secondary_url, content_type, resource_identifier); | 97 primary_url, secondary_url, content_type, resource_identifier); |
98 | 98 |
99 if (previous_value == CONTENT_SETTING_ALLOW && | 99 if (previous_value == CONTENT_SETTING_ALLOW && |
100 final_value != CONTENT_SETTING_ALLOW) { | 100 final_value != CONTENT_SETTING_ALLOW) { |
101 PermissionType permission_type; | 101 PermissionType permission_type; |
102 if (PermissionUtil::GetPermissionType(content_type, &permission_type)) { | 102 if (PermissionUtil::GetPermissionType(content_type, &permission_type)) { |
103 // TODO(stefanocs): Report revocations from page action as PAGE_ACTION | |
104 // source UI instead of SITE_SETTINGS source UI. | |
kcarattini
2016/07/07 01:57:51
Is this complex enough to warrant a separate cl? L
stefanocs
2016/07/07 03:50:55
After chatting offline, this will be fixed in the
| |
103 PermissionUmaUtil::PermissionRevoked(permission_type, primary_url, | 105 PermissionUmaUtil::PermissionRevoked(permission_type, primary_url, |
104 profile); | 106 SITE_SETTINGS, profile); |
105 } | 107 } |
106 } | 108 } |
107 } | 109 } |
OLD | NEW |