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

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

Issue 1373883003: Move geolocation and permission mojoms into components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 e8e3e71fc72247e3fbebfc35cf9f9e4949dd0c65..fbd0a2017d0284eadb86c542247a209c1d2a167f 100644
--- a/content/shell/browser/shell_permission_manager.cc
+++ b/content/shell/browser/shell_permission_manager.cc
@@ -24,9 +24,10 @@ int ShellPermissionManager::RequestPermission(
RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
bool user_gesture,
- const base::Callback<void(PermissionStatus)>& callback) {
+ const base::Callback<void(permission::Status)>& callback) {
callback.Run(permission == PermissionType::GEOLOCATION
- ? PERMISSION_STATUS_GRANTED : PERMISSION_STATUS_DENIED);
+ ? permission::STATUS_GRANTED
+ : permission::STATUS_DENIED);
return kNoPendingOperation;
}
@@ -39,7 +40,7 @@ void ShellPermissionManager::ResetPermission(
const GURL& embedding_origin) {
}
-PermissionStatus ShellPermissionManager::GetPermissionStatus(
+permission::Status ShellPermissionManager::GetPermissionStatus(
PermissionType permission,
const GURL& requesting_origin,
const GURL& embedding_origin) {
@@ -48,9 +49,9 @@ PermissionStatus ShellPermissionManager::GetPermissionStatus(
permission == PermissionType::VIDEO_CAPTURE) &&
command_line->HasSwitch(switches::kUseFakeDeviceForMediaStream) &&
command_line->HasSwitch(switches::kUseFakeUIForMediaStream)) {
- return PERMISSION_STATUS_GRANTED;
+ return permission::STATUS_GRANTED;
}
- return PERMISSION_STATUS_DENIED;
+ return permission::STATUS_DENIED;
}
void ShellPermissionManager::RegisterPermissionUsage(
@@ -63,7 +64,7 @@ int ShellPermissionManager::SubscribePermissionStatusChange(
PermissionType permission,
const GURL& requesting_origin,
const GURL& embedding_origin,
- const base::Callback<void(PermissionStatus)>& callback) {
+ const base::Callback<void(permission::Status)>& callback) {
return kNoPendingOperation;
}
« 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