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

Side by Side Diff: content/child/permissions/permission_dispatcher.cc

Issue 1865913005: Nuke WebPassOwnPtr<T> and replace it with std::unique_ptr<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 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/child/permissions/permission_dispatcher.h" 5 #include "content/child/permissions/permission_dispatcher.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 // static 216 // static
217 void PermissionDispatcher::RunPermissionCallbackOnWorkerThread( 217 void PermissionDispatcher::RunPermissionCallbackOnWorkerThread(
218 scoped_ptr<blink::WebPermissionCallback> callback, 218 scoped_ptr<blink::WebPermissionCallback> callback,
219 blink::WebPermissionStatus status) { 219 blink::WebPermissionStatus status) {
220 callback->onSuccess(status); 220 callback->onSuccess(status);
221 } 221 }
222 222
223 void PermissionDispatcher::RunPermissionsCallbackOnWorkerThread( 223 void PermissionDispatcher::RunPermissionsCallbackOnWorkerThread(
224 scoped_ptr<blink::WebPermissionsCallback> callback, 224 scoped_ptr<blink::WebPermissionsCallback> callback,
225 scoped_ptr<blink::WebVector<blink::WebPermissionStatus>> statuses) { 225 scoped_ptr<blink::WebVector<blink::WebPermissionStatus>> statuses) {
226 callback->onSuccess(blink::adoptWebPtr(statuses.release())); 226 callback->onSuccess(std::move(statuses));
227 } 227 }
228 228
229 blink::mojom::PermissionService* 229 blink::mojom::PermissionService*
230 PermissionDispatcher::GetPermissionServicePtr() { 230 PermissionDispatcher::GetPermissionServicePtr() {
231 if (!permission_service_.get()) { 231 if (!permission_service_.get()) {
232 service_registry_->ConnectToRemoteService( 232 service_registry_->ConnectToRemoteService(
233 mojo::GetProxy(&permission_service_)); 233 mojo::GetProxy(&permission_service_));
234 } 234 }
235 return permission_service_.get(); 235 return permission_service_.get();
236 } 236 }
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 if (worker_thread_id != kNoWorkerThread) { 359 if (worker_thread_id != kNoWorkerThread) {
360 // If the worker is no longer running, ::PostTask() will return false and 360 // If the worker is no longer running, ::PostTask() will return false and
361 // gracefully fail, destroying the callback too. 361 // gracefully fail, destroying the callback too.
362 WorkerThread::PostTask( 362 WorkerThread::PostTask(
363 worker_thread_id, 363 worker_thread_id,
364 base::Bind(&PermissionDispatcher::RunPermissionsCallbackOnWorkerThread, 364 base::Bind(&PermissionDispatcher::RunPermissionsCallbackOnWorkerThread,
365 base::Passed(&callback), base::Passed(&statuses))); 365 base::Passed(&callback), base::Passed(&statuses)));
366 return; 366 return;
367 } 367 }
368 368
369 callback->onSuccess(blink::adoptWebPtr(statuses.release())); 369 callback->onSuccess(std::move(statuses));
370 } 370 }
371 371
372 void PermissionDispatcher::OnPermissionChanged(blink::WebPermissionType type, 372 void PermissionDispatcher::OnPermissionChanged(blink::WebPermissionType type,
373 const std::string& origin, 373 const std::string& origin,
374 WebPermissionObserver* observer, 374 WebPermissionObserver* observer,
375 PermissionStatus status) { 375 PermissionStatus status) {
376 if (!IsObserverRegistered(observer)) 376 if (!IsObserverRegistered(observer))
377 return; 377 return;
378 378
379 observer->permissionChanged(type, GetWebPermissionStatus(status)); 379 observer->permissionChanged(type, GetWebPermissionStatus(status));
(...skipping 21 matching lines...) Expand all
401 origin, 401 origin,
402 current_status, 402 current_status,
403 base::Bind(&PermissionDispatcher::OnPermissionChanged, 403 base::Bind(&PermissionDispatcher::OnPermissionChanged,
404 base::Unretained(this), 404 base::Unretained(this),
405 type, 405 type,
406 origin, 406 origin,
407 base::Unretained(observer))); 407 base::Unretained(observer)));
408 } 408 }
409 409
410 } // namespace content 410 } // namespace content
OLDNEW
« no previous file with comments | « content/child/background_sync/background_sync_provider.cc ('k') | content/child/push_messaging/push_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698