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

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

Issue 1943963004: Revert of (reland) Move permission.mojom from WebKit/public/platform/ to components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 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 const base::Callback<void(permissions::mojom::PermissionStatus)>& 35 const base::Callback<void(blink::mojom::PermissionStatus)>& callback) {
36 callback) {
37 callback.Run(IsWhitelistedPermissionType(permission) 36 callback.Run(IsWhitelistedPermissionType(permission)
38 ? permissions::mojom::PermissionStatus::GRANTED 37 ? blink::mojom::PermissionStatus::GRANTED
39 : permissions::mojom::PermissionStatus::DENIED); 38 : blink::mojom::PermissionStatus::DENIED);
40 return kNoPendingOperation; 39 return kNoPendingOperation;
41 } 40 }
42 41
43 int ShellPermissionManager::RequestPermissions( 42 int ShellPermissionManager::RequestPermissions(
44 const std::vector<PermissionType>& permissions, 43 const std::vector<PermissionType>& permissions,
45 content::RenderFrameHost* render_frame_host, 44 content::RenderFrameHost* render_frame_host,
46 const GURL& requesting_origin, 45 const GURL& requesting_origin,
47 const base::Callback<void( 46 const base::Callback<
48 const std::vector<permissions::mojom::PermissionStatus>&)>& callback) { 47 void(const std::vector<blink::mojom::PermissionStatus>&)>& callback) {
49 std::vector<permissions::mojom::PermissionStatus> result(permissions.size()); 48 std::vector<blink::mojom::PermissionStatus> result(permissions.size());
50 for (const auto& permission : permissions) { 49 for (const auto& permission : permissions) {
51 result.push_back(IsWhitelistedPermissionType(permission) 50 result.push_back(IsWhitelistedPermissionType(permission)
52 ? permissions::mojom::PermissionStatus::GRANTED 51 ? blink::mojom::PermissionStatus::GRANTED
53 : permissions::mojom::PermissionStatus::DENIED); 52 : blink::mojom::PermissionStatus::DENIED);
54 } 53 }
55 callback.Run(result); 54 callback.Run(result);
56 return kNoPendingOperation; 55 return kNoPendingOperation;
57 } 56 }
58 57
59 void ShellPermissionManager::CancelPermissionRequest(int request_id) { 58 void ShellPermissionManager::CancelPermissionRequest(int request_id) {
60 } 59 }
61 60
62 void ShellPermissionManager::ResetPermission( 61 void ShellPermissionManager::ResetPermission(
63 PermissionType permission, 62 PermissionType permission,
64 const GURL& requesting_origin, 63 const GURL& requesting_origin,
65 const GURL& embedding_origin) { 64 const GURL& embedding_origin) {
66 } 65 }
67 66
68 permissions::mojom::PermissionStatus 67 blink::mojom::PermissionStatus ShellPermissionManager::GetPermissionStatus(
69 ShellPermissionManager::GetPermissionStatus(PermissionType permission, 68 PermissionType permission,
70 const GURL& requesting_origin, 69 const GURL& requesting_origin,
71 const GURL& embedding_origin) { 70 const GURL& embedding_origin) {
72 // Background sync browser tests require permission to be granted by default. 71 // Background sync browser tests require permission to be granted by default.
73 // TODO(nsatragno): add a command line flag so that it's only granted for 72 // TODO(nsatragno): add a command line flag so that it's only granted for
74 // tests. 73 // tests.
75 if (permission == PermissionType::BACKGROUND_SYNC) 74 if (permission == PermissionType::BACKGROUND_SYNC)
76 return permissions::mojom::PermissionStatus::GRANTED; 75 return blink::mojom::PermissionStatus::GRANTED;
77 76
78 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); 77 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
79 if ((permission == PermissionType::AUDIO_CAPTURE || 78 if ((permission == PermissionType::AUDIO_CAPTURE ||
80 permission == PermissionType::VIDEO_CAPTURE) && 79 permission == PermissionType::VIDEO_CAPTURE) &&
81 command_line->HasSwitch(switches::kUseFakeDeviceForMediaStream) && 80 command_line->HasSwitch(switches::kUseFakeDeviceForMediaStream) &&
82 command_line->HasSwitch(switches::kUseFakeUIForMediaStream)) { 81 command_line->HasSwitch(switches::kUseFakeUIForMediaStream)) {
83 return permissions::mojom::PermissionStatus::GRANTED; 82 return blink::mojom::PermissionStatus::GRANTED;
84 } 83 }
85 return permissions::mojom::PermissionStatus::DENIED; 84 return blink::mojom::PermissionStatus::DENIED;
86 } 85 }
87 86
88 void ShellPermissionManager::RegisterPermissionUsage( 87 void ShellPermissionManager::RegisterPermissionUsage(
89 PermissionType permission, 88 PermissionType permission,
90 const GURL& requesting_origin, 89 const GURL& requesting_origin,
91 const GURL& embedding_origin) { 90 const GURL& embedding_origin) {
92 } 91 }
93 92
94 int ShellPermissionManager::SubscribePermissionStatusChange( 93 int ShellPermissionManager::SubscribePermissionStatusChange(
95 PermissionType permission, 94 PermissionType permission,
96 const GURL& requesting_origin, 95 const GURL& requesting_origin,
97 const GURL& embedding_origin, 96 const GURL& embedding_origin,
98 const base::Callback<void(permissions::mojom::PermissionStatus)>& 97 const base::Callback<void(blink::mojom::PermissionStatus)>& callback) {
99 callback) {
100 return kNoPendingOperation; 98 return kNoPendingOperation;
101 } 99 }
102 100
103 void ShellPermissionManager::UnsubscribePermissionStatusChange( 101 void ShellPermissionManager::UnsubscribePermissionStatusChange(
104 int subscription_id) { 102 int subscription_id) {
105 } 103 }
106 104
107 } // namespace content 105 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/browser/shell_permission_manager.h ('k') | content/shell/common/layout_test/layout_test_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698