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

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

Issue 1342833002: permissions: handle request ids for permissions in permission manager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test failures Created 5 years, 3 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 fffcfa560c3baf9dd26e7e39c876492fc2650b7e..5210f2fe2483ffa5902346f54c5d5a5377700897 100644
--- a/content/shell/browser/shell_permission_manager.cc
+++ b/content/shell/browser/shell_permission_manager.cc
@@ -16,22 +16,18 @@ ShellPermissionManager::ShellPermissionManager()
ShellPermissionManager::~ShellPermissionManager() {
}
-void ShellPermissionManager::RequestPermission(
+int ShellPermissionManager::RequestPermission(
PermissionType permission,
RenderFrameHost* render_frame_host,
- int request_id,
const GURL& requesting_origin,
bool user_gesture,
const base::Callback<void(PermissionStatus)>& callback) {
callback.Run(permission == PermissionType::GEOLOCATION
? PERMISSION_STATUS_GRANTED : PERMISSION_STATUS_DENIED);
+ return -1;
mlamouri (slow - plz ping) 2015/09/16 14:42:57 ditto
Lalit Maganti 2015/09/16 16:41:10 Done.
}
-void ShellPermissionManager::CancelPermissionRequest(
- PermissionType permission,
- RenderFrameHost* render_frame_host,
- int request_id,
- const GURL& requesting_origin) {
+void ShellPermissionManager::CancelPermissionRequest(int request_id) {
}
void ShellPermissionManager::ResetPermission(

Powered by Google App Engine
This is Rietveld 408576698