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

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/sync_worker.h

Issue 1873683002: Convert //chrome/browser/sync_file_system from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 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 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_WORKER_H_ 5 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_WORKER_H_
6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_WORKER_H_ 6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_WORKER_H_
7 7
8 #include <memory>
8 #include <string> 9 #include <string>
9 10
10 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "base/observer_list.h" 14 #include "base/observer_list.h"
15 #include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h" 15 #include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h"
16 #include "chrome/browser/sync_file_system/drive_backend/sync_worker_interface.h" 16 #include "chrome/browser/sync_file_system/drive_backend/sync_worker_interface.h"
17 #include "chrome/browser/sync_file_system/remote_file_sync_service.h" 17 #include "chrome/browser/sync_file_system/remote_file_sync_service.h"
18 #include "chrome/browser/sync_file_system/sync_callbacks.h" 18 #include "chrome/browser/sync_file_system/sync_callbacks.h"
19 #include "chrome/browser/sync_file_system/task_logger.h" 19 #include "chrome/browser/sync_file_system/task_logger.h"
20 20
21 class ExtensionServiceInterface; 21 class ExtensionServiceInterface;
22 class GURL; 22 class GURL;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 54
55 class SyncWorker : public SyncWorkerInterface, 55 class SyncWorker : public SyncWorkerInterface,
56 public SyncTaskManager::Client { 56 public SyncTaskManager::Client {
57 public: 57 public:
58 SyncWorker(const base::FilePath& base_dir, 58 SyncWorker(const base::FilePath& base_dir,
59 const base::WeakPtr<ExtensionServiceInterface>& extension_service, 59 const base::WeakPtr<ExtensionServiceInterface>& extension_service,
60 leveldb::Env* env_override); 60 leveldb::Env* env_override);
61 61
62 ~SyncWorker() override; 62 ~SyncWorker() override;
63 63
64 void Initialize(scoped_ptr<SyncEngineContext> context) override; 64 void Initialize(std::unique_ptr<SyncEngineContext> context) override;
65 65
66 // SyncTaskManager::Client overrides 66 // SyncTaskManager::Client overrides
67 void MaybeScheduleNextTask() override; 67 void MaybeScheduleNextTask() override;
68 void NotifyLastOperationStatus(SyncStatusCode sync_status, 68 void NotifyLastOperationStatus(SyncStatusCode sync_status,
69 bool used_network) override; 69 bool used_network) override;
70 void RecordTaskLog(scoped_ptr<TaskLogger::TaskLog> task_log) override; 70 void RecordTaskLog(std::unique_ptr<TaskLogger::TaskLog> task_log) override;
71 71
72 // SyncWorkerInterface overrides 72 // SyncWorkerInterface overrides
73 void RegisterOrigin(const GURL& origin, 73 void RegisterOrigin(const GURL& origin,
74 const SyncStatusCallback& callback) override; 74 const SyncStatusCallback& callback) override;
75 void EnableOrigin(const GURL& origin, 75 void EnableOrigin(const GURL& origin,
76 const SyncStatusCallback& callback) override; 76 const SyncStatusCallback& callback) override;
77 void DisableOrigin(const GURL& origin, 77 void DisableOrigin(const GURL& origin,
78 const SyncStatusCallback& callback) override; 78 const SyncStatusCallback& callback) override;
79 void UninstallOrigin(const GURL& origin, 79 void UninstallOrigin(const GURL& origin,
80 RemoteFileSyncService::UninstallFlag flag, 80 RemoteFileSyncService::UninstallFlag flag,
81 const SyncStatusCallback& callback) override; 81 const SyncStatusCallback& callback) override;
82 void ProcessRemoteChange(const SyncFileCallback& callback) override; 82 void ProcessRemoteChange(const SyncFileCallback& callback) override;
83 void SetRemoteChangeProcessor(RemoteChangeProcessorOnWorker* 83 void SetRemoteChangeProcessor(RemoteChangeProcessorOnWorker*
84 remote_change_processor_on_worker) override; 84 remote_change_processor_on_worker) override;
85 RemoteServiceState GetCurrentState() const override; 85 RemoteServiceState GetCurrentState() const override;
86 void GetOriginStatusMap( 86 void GetOriginStatusMap(
87 const RemoteFileSyncService::StatusMapCallback& callback) override; 87 const RemoteFileSyncService::StatusMapCallback& callback) override;
88 scoped_ptr<base::ListValue> DumpFiles(const GURL& origin) override; 88 std::unique_ptr<base::ListValue> DumpFiles(const GURL& origin) override;
89 scoped_ptr<base::ListValue> DumpDatabase() override; 89 std::unique_ptr<base::ListValue> DumpDatabase() override;
90 void SetSyncEnabled(bool enabled) override; 90 void SetSyncEnabled(bool enabled) override;
91 void PromoteDemotedChanges(const base::Closure& callback) override; 91 void PromoteDemotedChanges(const base::Closure& callback) override;
92 void ApplyLocalChange(const FileChange& local_change, 92 void ApplyLocalChange(const FileChange& local_change,
93 const base::FilePath& local_path, 93 const base::FilePath& local_path,
94 const SyncFileMetadata& local_metadata, 94 const SyncFileMetadata& local_metadata,
95 const storage::FileSystemURL& url, 95 const storage::FileSystemURL& url,
96 const SyncStatusCallback& callback) override; 96 const SyncStatusCallback& callback) override;
97 void ActivateService(RemoteServiceState service_state, 97 void ActivateService(RemoteServiceState service_state,
98 const std::string& description) override; 98 const std::string& description) override;
99 void DeactivateService(const std::string& description) override; 99 void DeactivateService(const std::string& description) override;
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 RemoteServiceState service_state_; 158 RemoteServiceState service_state_;
159 159
160 bool should_check_conflict_; 160 bool should_check_conflict_;
161 bool should_check_remote_change_; 161 bool should_check_remote_change_;
162 bool listing_remote_changes_; 162 bool listing_remote_changes_;
163 base::TimeTicks time_to_check_changes_; 163 base::TimeTicks time_to_check_changes_;
164 164
165 bool sync_enabled_; 165 bool sync_enabled_;
166 base::Closure call_on_idle_callback_; 166 base::Closure call_on_idle_callback_;
167 167
168 scoped_ptr<SyncTaskManager> task_manager_; 168 std::unique_ptr<SyncTaskManager> task_manager_;
169 169
170 base::WeakPtr<ExtensionServiceInterface> extension_service_; 170 base::WeakPtr<ExtensionServiceInterface> extension_service_;
171 171
172 scoped_ptr<SyncEngineContext> context_; 172 std::unique_ptr<SyncEngineContext> context_;
173 base::ObserverList<Observer> observers_; 173 base::ObserverList<Observer> observers_;
174 174
175 base::SequenceChecker sequence_checker_; 175 base::SequenceChecker sequence_checker_;
176 176
177 base::WeakPtrFactory<SyncWorker> weak_ptr_factory_; 177 base::WeakPtrFactory<SyncWorker> weak_ptr_factory_;
178 DISALLOW_COPY_AND_ASSIGN(SyncWorker); 178 DISALLOW_COPY_AND_ASSIGN(SyncWorker);
179 }; 179 };
180 180
181 } // namespace drive_backend 181 } // namespace drive_backend
182 } // namespace sync_file_system 182 } // namespace sync_file_system
183 183
184 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_WORKER_H_ 184 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_WORKER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698