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

Side by Side Diff: chrome/browser/sync_file_system/sync_file_system_service.h

Issue 2767893002: Remove ScopedVector from chrome/browser/. (Closed)
Patch Set: Address comments from zea@ Created 3 years, 9 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_SYNC_FILE_SYSTEM_SERVICE_H_ 5 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_SERVICE_H_
6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_SERVICE_H_ 6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_SERVICE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 #include <string> 10 #include <string>
11 #include <vector>
11 12
12 #include "base/callback_forward.h" 13 #include "base/callback_forward.h"
13 #include "base/macros.h" 14 #include "base/macros.h"
14 #include "base/memory/scoped_vector.h"
15 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
16 #include "base/observer_list.h" 16 #include "base/observer_list.h"
17 #include "chrome/browser/sync_file_system/conflict_resolution_policy.h" 17 #include "chrome/browser/sync_file_system/conflict_resolution_policy.h"
18 #include "chrome/browser/sync_file_system/file_status_observer.h" 18 #include "chrome/browser/sync_file_system/file_status_observer.h"
19 #include "chrome/browser/sync_file_system/remote_file_sync_service.h" 19 #include "chrome/browser/sync_file_system/remote_file_sync_service.h"
20 #include "chrome/browser/sync_file_system/sync_callbacks.h" 20 #include "chrome/browser/sync_file_system/sync_callbacks.h"
21 #include "chrome/browser/sync_file_system/sync_process_runner.h" 21 #include "chrome/browser/sync_file_system/sync_process_runner.h"
22 #include "chrome/browser/sync_file_system/sync_service_state.h" 22 #include "chrome/browser/sync_file_system/sync_service_state.h"
23 #include "chrome/browser/sync_file_system/task_logger.h" 23 #include "chrome/browser/sync_file_system/task_logger.h"
24 #include "components/keyed_service/core/keyed_service.h" 24 #include "components/keyed_service/core/keyed_service.h"
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 // Runs the SyncProcessRunner method of all sync runners (e.g. for Local sync 165 // Runs the SyncProcessRunner method of all sync runners (e.g. for Local sync
166 // and Remote sync). 166 // and Remote sync).
167 void RunForEachSyncRunners(void(SyncProcessRunner::*method)()); 167 void RunForEachSyncRunners(void(SyncProcessRunner::*method)());
168 168
169 Profile* profile_; 169 Profile* profile_;
170 170
171 std::unique_ptr<LocalFileSyncService> local_service_; 171 std::unique_ptr<LocalFileSyncService> local_service_;
172 std::unique_ptr<RemoteFileSyncService> remote_service_; 172 std::unique_ptr<RemoteFileSyncService> remote_service_;
173 173
174 // Holds all SyncProcessRunners. 174 // Holds all SyncProcessRunners.
175 ScopedVector<SyncProcessRunner> local_sync_runners_; 175 std::vector<std::unique_ptr<SyncProcessRunner>> local_sync_runners_;
176 ScopedVector<SyncProcessRunner> remote_sync_runners_; 176 std::vector<std::unique_ptr<SyncProcessRunner>> remote_sync_runners_;
177 177
178 // Indicates if sync is currently enabled or not. 178 // Indicates if sync is currently enabled or not.
179 bool sync_enabled_; 179 bool sync_enabled_;
180 180
181 TaskLogger task_logger_; 181 TaskLogger task_logger_;
182 base::ObserverList<SyncEventObserver> observers_; 182 base::ObserverList<SyncEventObserver> observers_;
183 183
184 bool promoting_demoted_changes_; 184 bool promoting_demoted_changes_;
185 base::Closure idle_callback_; 185 base::Closure idle_callback_;
186 186
187 DISALLOW_COPY_AND_ASSIGN(SyncFileSystemService); 187 DISALLOW_COPY_AND_ASSIGN(SyncFileSystemService);
188 }; 188 };
189 189
190 } // namespace sync_file_system 190 } // namespace sync_file_system
191 191
192 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_SERVICE_H_ 192 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698