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

Side by Side Diff: chrome/browser/permissions/permission_context_base.cc

Issue 2315563002: Add PermissionPromptAndroid skeleton (Closed)
Patch Set: minor change Created 4 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
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/permissions/permission_prompt_android.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/permissions/permission_context_base.h" 5 #include "chrome/browser/permissions/permission_context_base.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/memory/ptr_util.h"
12 #include "base/strings/stringprintf.h" 13 #include "base/strings/stringprintf.h"
13 #include "build/build_config.h" 14 #include "build/build_config.h"
14 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" 15 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
15 #include "chrome/browser/permissions/permission_decision_auto_blocker.h" 16 #include "chrome/browser/permissions/permission_decision_auto_blocker.h"
16 #include "chrome/browser/permissions/permission_request.h" 17 #include "chrome/browser/permissions/permission_request.h"
17 #include "chrome/browser/permissions/permission_request_id.h" 18 #include "chrome/browser/permissions/permission_request_id.h"
19 #include "chrome/browser/permissions/permission_request_impl.h"
20 #include "chrome/browser/permissions/permission_request_manager.h"
18 #include "chrome/browser/permissions/permission_uma_util.h" 21 #include "chrome/browser/permissions/permission_uma_util.h"
19 #include "chrome/browser/permissions/permission_util.h" 22 #include "chrome/browser/permissions/permission_util.h"
20 #include "chrome/browser/profiles/profile.h" 23 #include "chrome/browser/profiles/profile.h"
21 #include "chrome/common/pref_names.h" 24 #include "chrome/common/pref_names.h"
22 #include "components/content_settings/core/browser/host_content_settings_map.h" 25 #include "components/content_settings/core/browser/host_content_settings_map.h"
23 #include "components/content_settings/core/browser/website_settings_registry.h" 26 #include "components/content_settings/core/browser/website_settings_registry.h"
24 #include "components/prefs/pref_service.h" 27 #include "components/prefs/pref_service.h"
25 #include "components/variations/variations_associated_data.h" 28 #include "components/variations/variations_associated_data.h"
26 #include "content/public/browser/browser_thread.h" 29 #include "content/public/browser/browser_thread.h"
27 #include "content/public/browser/render_frame_host.h" 30 #include "content/public/browser/render_frame_host.h"
28 #include "content/public/browser/web_contents.h" 31 #include "content/public/browser/web_contents.h"
29 #include "content/public/common/origin_util.h" 32 #include "content/public/common/origin_util.h"
30 #include "url/gurl.h" 33 #include "url/gurl.h"
31 34
32 #if defined(OS_ANDROID) 35 #if defined(OS_ANDROID)
33 #include "chrome/browser/permissions/permission_queue_controller.h" 36 #include "chrome/browser/permissions/permission_queue_controller.h"
34 #else
35 #include "chrome/browser/permissions/permission_request_impl.h"
36 #include "chrome/browser/permissions/permission_request_manager.h"
37 #endif 37 #endif
38 38
39 // static 39 // static
40 const char PermissionContextBase::kPermissionsKillSwitchFieldStudy[] = 40 const char PermissionContextBase::kPermissionsKillSwitchFieldStudy[] =
41 "PermissionsKillSwitch"; 41 "PermissionsKillSwitch";
42 // static 42 // static
43 const char PermissionContextBase::kPermissionsKillSwitchBlockedValue[] = 43 const char PermissionContextBase::kPermissionsKillSwitchBlockedValue[] =
44 "blocked"; 44 "blocked";
45 45
46 PermissionContextBase::PermissionContextBase( 46 PermissionContextBase::PermissionContextBase(
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 167
168 void PermissionContextBase::DecidePermission( 168 void PermissionContextBase::DecidePermission(
169 content::WebContents* web_contents, 169 content::WebContents* web_contents,
170 const PermissionRequestID& id, 170 const PermissionRequestID& id,
171 const GURL& requesting_origin, 171 const GURL& requesting_origin,
172 const GURL& embedding_origin, 172 const GURL& embedding_origin,
173 bool user_gesture, 173 bool user_gesture,
174 const BrowserPermissionCallback& callback) { 174 const BrowserPermissionCallback& callback) {
175 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 175 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
176 176
177 #if !defined(OS_ANDROID) 177 if (PermissionRequestManager::IsEnabled()) {
178 PermissionRequestManager* permission_request_manager = 178 PermissionRequestManager* permission_request_manager =
179 PermissionRequestManager::FromWebContents(web_contents); 179 PermissionRequestManager::FromWebContents(web_contents);
180 // TODO(felt): sometimes |permission_request_manager| is null. This check is 180 // TODO(felt): sometimes |permission_request_manager| is null. This check is
181 // meant to prevent crashes. See crbug.com/457091. 181 // meant to prevent crashes. See crbug.com/457091.
182 if (!permission_request_manager) 182 if (!permission_request_manager)
183 return; 183 return;
184 std::unique_ptr<PermissionRequest> request_ptr(new PermissionRequestImpl(
185 requesting_origin, permission_type_, profile_, user_gesture,
186 base::Bind(&PermissionContextBase::PermissionDecided,
187 weak_factory_.GetWeakPtr(), id, requesting_origin,
188 embedding_origin, user_gesture, callback),
189 base::Bind(&PermissionContextBase::CleanUpRequest,
190 weak_factory_.GetWeakPtr(), id)));
191 PermissionRequest* request = request_ptr.get();
192 184
193 bool inserted = 185 std::unique_ptr<PermissionRequest> request_ptr =
194 pending_requests_.add(id.ToString(), std::move(request_ptr)).second; 186 base::MakeUnique<PermissionRequestImpl>(
195 DCHECK(inserted) << "Duplicate id " << id.ToString(); 187 requesting_origin, permission_type_, profile_, user_gesture,
196 permission_request_manager->AddRequest(request); 188 base::Bind(&PermissionContextBase::PermissionDecided,
189 weak_factory_.GetWeakPtr(), id, requesting_origin,
190 embedding_origin, user_gesture, callback),
191 base::Bind(&PermissionContextBase::CleanUpRequest,
192 weak_factory_.GetWeakPtr(), id));
193 PermissionRequest* request = request_ptr.get();
194
195 bool inserted =
196 pending_requests_.add(id.ToString(), std::move(request_ptr)).second;
197 DCHECK(inserted) << "Duplicate id " << id.ToString();
198 permission_request_manager->AddRequest(request);
199 } else {
200 #if defined(OS_ANDROID)
201 GetQueueController()->CreateInfoBarRequest(
202 id, requesting_origin, embedding_origin, user_gesture,
203 base::Bind(&PermissionContextBase::PermissionDecided,
204 weak_factory_.GetWeakPtr(), id, requesting_origin,
205 embedding_origin, user_gesture, callback,
206 // the queue controller takes care of persisting the
207 // permission
208 false));
197 #else 209 #else
198 GetQueueController()->CreateInfoBarRequest( 210 NOTREACHED();
199 id, requesting_origin, embedding_origin, user_gesture,
200 base::Bind(&PermissionContextBase::PermissionDecided,
201 weak_factory_.GetWeakPtr(), id, requesting_origin,
202 embedding_origin, user_gesture, callback,
203 // the queue controller takes care of persisting the
204 // permission
205 false));
206 #endif 211 #endif
212 }
207 } 213 }
208 214
209 void PermissionContextBase::PermissionDecided( 215 void PermissionContextBase::PermissionDecided(
210 const PermissionRequestID& id, 216 const PermissionRequestID& id,
211 const GURL& requesting_origin, 217 const GURL& requesting_origin,
212 const GURL& embedding_origin, 218 const GURL& embedding_origin,
213 bool user_gesture, 219 bool user_gesture,
214 const BrowserPermissionCallback& callback, 220 const BrowserPermissionCallback& callback,
215 bool persist, 221 bool persist,
216 ContentSetting content_setting) { 222 ContentSetting content_setting) {
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 content_setting); 307 content_setting);
302 } 308 }
303 309
304 bool PermissionContextBase::IsPermissionKillSwitchOn() const { 310 bool PermissionContextBase::IsPermissionKillSwitchOn() const {
305 const std::string param = variations::GetVariationParamValue( 311 const std::string param = variations::GetVariationParamValue(
306 kPermissionsKillSwitchFieldStudy, 312 kPermissionsKillSwitchFieldStudy,
307 PermissionUtil::GetPermissionString(permission_type_)); 313 PermissionUtil::GetPermissionString(permission_type_));
308 314
309 return param == kPermissionsKillSwitchBlockedValue; 315 return param == kPermissionsKillSwitchBlockedValue;
310 } 316 }
OLDNEW
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/permissions/permission_prompt_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698