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

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

Issue 1411653004: Remove last usage functions from HostContentSettingsMap Base URL: https://chromium.googlesource.com/chromium/src.git@simplify-host-content-settings
Patch Set: Created 5 years, 1 month 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/notifications/notification_permission_context.h" 8 #include "chrome/browser/notifications/notification_permission_context.h"
9 #include "chrome/browser/notifications/notification_permission_context_factory.h " 9 #include "chrome/browser/notifications/notification_permission_context_factory.h "
10 #include "chrome/browser/permissions/permission_context_uma_util.h" 10 #include "chrome/browser/permissions/permission_context_uma_util.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 112
113 void PushMessagingPermissionContext::DecidePushPermission( 113 void PushMessagingPermissionContext::DecidePushPermission(
114 const PermissionRequestID& id, 114 const PermissionRequestID& id,
115 const GURL& requesting_origin, 115 const GURL& requesting_origin,
116 const GURL& embedding_origin, 116 const GURL& embedding_origin,
117 const BrowserPermissionCallback& callback, 117 const BrowserPermissionCallback& callback,
118 ContentSetting notification_content_setting) { 118 ContentSetting notification_content_setting) {
119 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 119 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
120 ContentSetting push_content_setting = 120 ContentSetting push_content_setting =
121 HostContentSettingsMapFactory::GetForProfile(profile_) 121 HostContentSettingsMapFactory::GetForProfile(profile_)
122 ->GetContentSettingAndMaybeUpdateLastUsage( 122 ->GetContentSetting(
123 requesting_origin, embedding_origin, kPushSettingType, 123 requesting_origin, embedding_origin, kPushSettingType,
124 std::string()); 124 std::string());
125 125
126 if (push_content_setting == CONTENT_SETTING_BLOCK) { 126 if (push_content_setting == CONTENT_SETTING_BLOCK) {
127 DVLOG(1) << "Push permission was explicitly blocked."; 127 DVLOG(1) << "Push permission was explicitly blocked.";
128 PermissionContextUmaUtil::PermissionDenied(kPushSettingType, 128 PermissionContextUmaUtil::PermissionDenied(kPushSettingType,
129 requesting_origin); 129 requesting_origin);
130 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, 130 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
131 true /* persist */, CONTENT_SETTING_BLOCK); 131 true /* persist */, CONTENT_SETTING_BLOCK);
132 return; 132 return;
133 } 133 }
134 134
135 if (notification_content_setting != CONTENT_SETTING_ALLOW) { 135 if (notification_content_setting != CONTENT_SETTING_ALLOW) {
136 DVLOG(1) << "Notification permission has not been granted."; 136 DVLOG(1) << "Notification permission has not been granted.";
137 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, 137 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
138 false /* persist */, notification_content_setting); 138 false /* persist */, notification_content_setting);
139 return; 139 return;
140 } 140 }
141 141
142 PermissionContextUmaUtil::PermissionGranted(kPushSettingType, 142 PermissionContextUmaUtil::PermissionGranted(kPushSettingType,
143 requesting_origin); 143 requesting_origin);
144 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, 144 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
145 true /* persist */, CONTENT_SETTING_ALLOW); 145 true /* persist */, CONTENT_SETTING_ALLOW);
146 } 146 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698