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

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/sync_task.cc

Issue 1545283002: Convert Pass()→std::move() in //chrome/browser/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chrome/browser/sync_file_system/drive_backend/sync_task.h" 5 #include "chrome/browser/sync_file_system/drive_backend/sync_task.h"
6 6
7 #include <utility>
8
7 #include "base/bind.h" 9 #include "base/bind.h"
8 #include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h" 10 #include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h"
9 #include "chrome/browser/sync_file_system/drive_backend/sync_task_token.h" 11 #include "chrome/browser/sync_file_system/drive_backend/sync_task_token.h"
10 #include "chrome/browser/sync_file_system/drive_backend/task_dependency_manager. h" 12 #include "chrome/browser/sync_file_system/drive_backend/task_dependency_manager. h"
11 13
12 namespace sync_file_system { 14 namespace sync_file_system {
13 namespace drive_backend { 15 namespace drive_backend {
14 16
15 namespace { 17 namespace {
16 18
17 void CallRunExclusive(const base::WeakPtr<ExclusiveTask>& task, 19 void CallRunExclusive(const base::WeakPtr<ExclusiveTask>& task,
18 scoped_ptr<SyncTaskToken> token) { 20 scoped_ptr<SyncTaskToken> token) {
19 if (task) 21 if (task)
20 task->RunExclusive(SyncTaskToken::WrapToCallback(token.Pass())); 22 task->RunExclusive(SyncTaskToken::WrapToCallback(std::move(token)));
21 } 23 }
22 24
23 } // namespace 25 } // namespace
24 26
25 ExclusiveTask::ExclusiveTask() : weak_ptr_factory_(this) {} 27 ExclusiveTask::ExclusiveTask() : weak_ptr_factory_(this) {}
26 ExclusiveTask::~ExclusiveTask() {} 28 ExclusiveTask::~ExclusiveTask() {}
27 29
28 void ExclusiveTask::RunPreflight(scoped_ptr<SyncTaskToken> token) { 30 void ExclusiveTask::RunPreflight(scoped_ptr<SyncTaskToken> token) {
29 scoped_ptr<TaskBlocker> task_blocker(new TaskBlocker); 31 scoped_ptr<TaskBlocker> task_blocker(new TaskBlocker);
30 task_blocker->exclusive = true; 32 task_blocker->exclusive = true;
31 33
32 SyncTaskManager::UpdateTaskBlocker( 34 SyncTaskManager::UpdateTaskBlocker(
33 token.Pass(), task_blocker.Pass(), 35 std::move(token), std::move(task_blocker),
34 base::Bind(&CallRunExclusive, weak_ptr_factory_.GetWeakPtr())); 36 base::Bind(&CallRunExclusive, weak_ptr_factory_.GetWeakPtr()));
35 } 37 }
36 38
37 } // namespace drive_backend 39 } // namespace drive_backend
38 } // namespace sync_file_system 40 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698