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

Unified Diff: content/child/permissions/permission_dispatcher.cc

Issue 1309803006: [VR, Permission] Use appopriate type parameters for WebCallbacks (2/3) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
« no previous file with comments | « content/child/permissions/permission_dispatcher.h ('k') | content/renderer/vr/vr_dispatcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/permissions/permission_dispatcher.cc
diff --git a/content/child/permissions/permission_dispatcher.cc b/content/child/permissions/permission_dispatcher.cc
index 552d2fda35ebb1e3acd9d1e32ece4455e1fcdb8a..34a40d95d40620f99d75bdc2ddcf470b2ad0110c 100644
--- a/content/child/permissions/permission_dispatcher.cc
+++ b/content/child/permissions/permission_dispatcher.cc
@@ -221,8 +221,8 @@ void PermissionDispatcher::GetNextPermissionChangeForWorker(
// static
void PermissionDispatcher::RunCallbackOnWorkerThread(
blink::WebPermissionCallback* callback,
- scoped_ptr<blink::WebPermissionStatus> status) {
- callback->onSuccess(status.release());
+ blink::WebPermissionStatus status) {
+ callback->onSuccess(status);
delete callback;
}
@@ -297,8 +297,7 @@ void PermissionDispatcher::OnPermissionResponse(int request_id,
CallbackInformation* callback_information =
pending_callbacks_.Lookup(request_id);
DCHECK(callback_information && callback_information->callback());
- scoped_ptr<blink::WebPermissionStatus> status(
- new blink::WebPermissionStatus(GetWebPermissionStatus(result)));
+ blink::WebPermissionStatus status = GetWebPermissionStatus(result);
if (callback_information->worker_thread_id() != kNoWorkerThread) {
blink::WebPermissionCallback* callback =
@@ -311,12 +310,11 @@ void PermissionDispatcher::OnPermissionResponse(int request_id,
WorkerTaskRunner::Instance()->PostTask(
worker_thread_id,
base::Bind(&PermissionDispatcher::RunCallbackOnWorkerThread,
- base::Unretained(callback),
- base::Passed(&status)));
+ base::Unretained(callback), status));
return;
}
- callback_information->callback()->onSuccess(status.release());
+ callback_information->callback()->onSuccess(status);
pending_callbacks_.Remove(request_id);
}
« no previous file with comments | « content/child/permissions/permission_dispatcher.h ('k') | content/renderer/vr/vr_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698