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

Unified Diff: content/shell/browser/shell_permission_manager.cc

Issue 1921553003: 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, 8 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 side-by-side diff with in-line comments
Download patch
Index: content/shell/browser/shell_permission_manager.cc
diff --git a/content/shell/browser/shell_permission_manager.cc b/content/shell/browser/shell_permission_manager.cc
index 6283a7b032680d0af7fa0f6beebb16aaf594fea5..071d2501b1d1924c04da09a87db9fb801d481bb8 100644
--- a/content/shell/browser/shell_permission_manager.cc
+++ b/content/shell/browser/shell_permission_manager.cc
@@ -32,10 +32,10 @@ int ShellPermissionManager::RequestPermission(
PermissionType permission,
RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
- const base::Callback<void(blink::mojom::PermissionStatus)>& callback) {
+ const base::Callback<void(permission::mojom::PermissionStatus)>& callback) {
callback.Run(IsWhitelistedPermissionType(permission)
- ? blink::mojom::PermissionStatus::GRANTED
- : blink::mojom::PermissionStatus::DENIED);
+ ? permission::mojom::PermissionStatus::GRANTED
+ : permission::mojom::PermissionStatus::DENIED);
return kNoPendingOperation;
}
@@ -43,13 +43,13 @@ int ShellPermissionManager::RequestPermissions(
const std::vector<PermissionType>& permissions,
content::RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
- const base::Callback<
- void(const std::vector<blink::mojom::PermissionStatus>&)>& callback) {
- std::vector<blink::mojom::PermissionStatus> result(permissions.size());
+ const base::Callback<void(
+ const std::vector<permission::mojom::PermissionStatus>&)>& callback) {
+ std::vector<permission::mojom::PermissionStatus> result(permissions.size());
for (const auto& permission : permissions) {
result.push_back(IsWhitelistedPermissionType(permission)
- ? blink::mojom::PermissionStatus::GRANTED
- : blink::mojom::PermissionStatus::DENIED);
+ ? permission::mojom::PermissionStatus::GRANTED
+ : permission::mojom::PermissionStatus::DENIED);
}
callback.Run(result);
return kNoPendingOperation;
@@ -64,7 +64,7 @@ void ShellPermissionManager::ResetPermission(
const GURL& embedding_origin) {
}
-blink::mojom::PermissionStatus ShellPermissionManager::GetPermissionStatus(
+permission::mojom::PermissionStatus ShellPermissionManager::GetPermissionStatus(
PermissionType permission,
const GURL& requesting_origin,
const GURL& embedding_origin) {
@@ -72,16 +72,16 @@ blink::mojom::PermissionStatus ShellPermissionManager::GetPermissionStatus(
// TODO(nsatragno): add a command line flag so that it's only granted for
// tests.
if (permission == PermissionType::BACKGROUND_SYNC)
- return blink::mojom::PermissionStatus::GRANTED;
+ return permission::mojom::PermissionStatus::GRANTED;
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
if ((permission == PermissionType::AUDIO_CAPTURE ||
permission == PermissionType::VIDEO_CAPTURE) &&
command_line->HasSwitch(switches::kUseFakeDeviceForMediaStream) &&
command_line->HasSwitch(switches::kUseFakeUIForMediaStream)) {
- return blink::mojom::PermissionStatus::GRANTED;
+ return permission::mojom::PermissionStatus::GRANTED;
}
- return blink::mojom::PermissionStatus::DENIED;
+ return permission::mojom::PermissionStatus::DENIED;
}
void ShellPermissionManager::RegisterPermissionUsage(
@@ -94,7 +94,7 @@ int ShellPermissionManager::SubscribePermissionStatusChange(
PermissionType permission,
const GURL& requesting_origin,
const GURL& embedding_origin,
- const base::Callback<void(blink::mojom::PermissionStatus)>& callback) {
+ const base::Callback<void(permission::mojom::PermissionStatus)>& callback) {
return kNoPendingOperation;
}

Powered by Google App Engine
This is Rietveld 408576698