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

Side by Side Diff: content/shell/browser/shell_permission_manager.cc

Issue 2110343002: Reintroduce plumbing for user gesture into permission system. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formatting Created 4 years, 5 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 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 "content/shell/browser/shell_permission_manager.h" 5 #include "content/shell/browser/shell_permission_manager.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "content/public/browser/permission_type.h" 9 #include "content/public/browser/permission_type.h"
10 #include "content/public/common/content_switches.h" 10 #include "content/public/common/content_switches.h"
(...skipping 14 matching lines...) Expand all
25 : PermissionManager() { 25 : PermissionManager() {
26 } 26 }
27 27
28 ShellPermissionManager::~ShellPermissionManager() { 28 ShellPermissionManager::~ShellPermissionManager() {
29 } 29 }
30 30
31 int ShellPermissionManager::RequestPermission( 31 int ShellPermissionManager::RequestPermission(
32 PermissionType permission, 32 PermissionType permission,
33 RenderFrameHost* render_frame_host, 33 RenderFrameHost* render_frame_host,
34 const GURL& requesting_origin, 34 const GURL& requesting_origin,
35 bool user_gesture,
35 const base::Callback<void(blink::mojom::PermissionStatus)>& callback) { 36 const base::Callback<void(blink::mojom::PermissionStatus)>& callback) {
36 callback.Run(IsWhitelistedPermissionType(permission) 37 callback.Run(IsWhitelistedPermissionType(permission)
37 ? blink::mojom::PermissionStatus::GRANTED 38 ? blink::mojom::PermissionStatus::GRANTED
38 : blink::mojom::PermissionStatus::DENIED); 39 : blink::mojom::PermissionStatus::DENIED);
39 return kNoPendingOperation; 40 return kNoPendingOperation;
40 } 41 }
41 42
42 int ShellPermissionManager::RequestPermissions( 43 int ShellPermissionManager::RequestPermissions(
43 const std::vector<PermissionType>& permissions, 44 const std::vector<PermissionType>& permissions,
44 content::RenderFrameHost* render_frame_host, 45 content::RenderFrameHost* render_frame_host,
45 const GURL& requesting_origin, 46 const GURL& requesting_origin,
47 bool user_gesture,
46 const base::Callback< 48 const base::Callback<
47 void(const std::vector<blink::mojom::PermissionStatus>&)>& callback) { 49 void(const std::vector<blink::mojom::PermissionStatus>&)>& callback) {
48 std::vector<blink::mojom::PermissionStatus> result(permissions.size()); 50 std::vector<blink::mojom::PermissionStatus> result(permissions.size());
49 for (const auto& permission : permissions) { 51 for (const auto& permission : permissions) {
50 result.push_back(IsWhitelistedPermissionType(permission) 52 result.push_back(IsWhitelistedPermissionType(permission)
51 ? blink::mojom::PermissionStatus::GRANTED 53 ? blink::mojom::PermissionStatus::GRANTED
52 : blink::mojom::PermissionStatus::DENIED); 54 : blink::mojom::PermissionStatus::DENIED);
53 } 55 }
54 callback.Run(result); 56 callback.Run(result);
55 return kNoPendingOperation; 57 return kNoPendingOperation;
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 const GURL& embedding_origin, 98 const GURL& embedding_origin,
97 const base::Callback<void(blink::mojom::PermissionStatus)>& callback) { 99 const base::Callback<void(blink::mojom::PermissionStatus)>& callback) {
98 return kNoPendingOperation; 100 return kNoPendingOperation;
99 } 101 }
100 102
101 void ShellPermissionManager::UnsubscribePermissionStatusChange( 103 void ShellPermissionManager::UnsubscribePermissionStatusChange(
102 int subscription_id) { 104 int subscription_id) {
103 } 105 }
104 106
105 } // namespace content 107 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698