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

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

Issue 1153873003: Add way for PermissionContext to be automatically restricted to secure origins. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@midi_permission_sysex
Patch Set: Created 5 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/permission_context_uma_util.h" 7 #include "chrome/browser/content_settings/permission_context_uma_util.h"
8 #include "chrome/browser/notifications/desktop_notification_service.h" 8 #include "chrome/browser/notifications/desktop_notification_service.h"
9 #include "chrome/browser/notifications/desktop_notification_service_factory.h" 9 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 web_contents, id, requesting_origin, user_gesture, 95 web_contents, id, requesting_origin, user_gesture,
96 base::Bind(&PushMessagingPermissionContext::DecidePushPermission, 96 base::Bind(&PushMessagingPermissionContext::DecidePushPermission,
97 weak_factory_ui_thread_.GetWeakPtr(), id, requesting_origin, 97 weak_factory_ui_thread_.GetWeakPtr(), id, requesting_origin,
98 embedding_origin, callback)); 98 embedding_origin, callback));
99 #else 99 #else
100 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, 100 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
101 false /* persist */, CONTENT_SETTING_BLOCK); 101 false /* persist */, CONTENT_SETTING_BLOCK);
102 #endif 102 #endif
103 } 103 }
104 104
105 bool PushMessagingPermissionContext::RestrictToSecureOrigins() const {
106 return true;
ddorwin 2015/05/26 17:31:31 This is a change in behavior (like MIDI in the oth
mlamouri (slow - plz ping) 2015/05/29 14:35:15 Correct.
107 }
108
105 void PushMessagingPermissionContext::DecidePushPermission( 109 void PushMessagingPermissionContext::DecidePushPermission(
106 const PermissionRequestID& id, 110 const PermissionRequestID& id,
107 const GURL& requesting_origin, 111 const GURL& requesting_origin,
108 const GURL& embedding_origin, 112 const GURL& embedding_origin,
109 const BrowserPermissionCallback& callback, 113 const BrowserPermissionCallback& callback,
110 ContentSetting notification_content_setting) { 114 ContentSetting notification_content_setting) {
111 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 115 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
112 ContentSetting push_content_setting = 116 ContentSetting push_content_setting =
113 profile_->GetHostContentSettingsMap() 117 profile_->GetHostContentSettingsMap()
114 ->GetContentSettingAndMaybeUpdateLastUsage( 118 ->GetContentSettingAndMaybeUpdateLastUsage(
(...skipping 14 matching lines...) Expand all
129 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, 133 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
130 false /* persist */, notification_content_setting); 134 false /* persist */, notification_content_setting);
131 return; 135 return;
132 } 136 }
133 137
134 PermissionContextUmaUtil::PermissionGranted(kPushSettingType, 138 PermissionContextUmaUtil::PermissionGranted(kPushSettingType,
135 requesting_origin); 139 requesting_origin);
136 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, 140 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
137 true /* persist */, CONTENT_SETTING_ALLOW); 141 true /* persist */, CONTENT_SETTING_ALLOW);
138 } 142 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698