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

Side by Side Diff: components/sync/device_info/device_info_service.h

Issue 2401223002: [Sync] Renaming sync/api* to sync/model*. (Closed)
Patch Set: Missed a comment in a DEPS file, and rebasing. Created 4 years, 2 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
« no previous file with comments | « components/sync/device_info/DEPS ('k') | components/sync/device_info/device_info_service.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef COMPONENTS_SYNC_DEVICE_INFO_DEVICE_INFO_SERVICE_H_ 5 #ifndef COMPONENTS_SYNC_DEVICE_INFO_DEVICE_INFO_SERVICE_H_
6 #define COMPONENTS_SYNC_DEVICE_INFO_DEVICE_INFO_SERVICE_H_ 6 #define COMPONENTS_SYNC_DEVICE_INFO_DEVICE_INFO_SERVICE_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
11 #include <memory> 11 #include <memory>
12 #include <string> 12 #include <string>
13 #include <vector> 13 #include <vector>
14 14
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
17 #include "base/observer_list.h" 17 #include "base/observer_list.h"
18 #include "base/time/time.h" 18 #include "base/time/time.h"
19 #include "base/timer/timer.h" 19 #include "base/timer/timer.h"
20 #include "components/sync/api/model_type_service.h"
21 #include "components/sync/api/model_type_store.h"
22 #include "components/sync/core/simple_metadata_change_list.h" 20 #include "components/sync/core/simple_metadata_change_list.h"
23 #include "components/sync/device_info/device_info_tracker.h" 21 #include "components/sync/device_info/device_info_tracker.h"
24 #include "components/sync/device_info/local_device_info_provider.h" 22 #include "components/sync/device_info/local_device_info_provider.h"
23 #include "components/sync/model/model_type_service.h"
24 #include "components/sync/model/model_type_store.h"
25 25
26 namespace syncer { 26 namespace syncer {
27 class SyncError; 27 class SyncError;
28 } // namespace syncer 28 } // namespace syncer
29 29
30 namespace syncer { 30 namespace syncer {
31 class ModelTypeChangeProcessor; 31 class ModelTypeChangeProcessor;
32 } // namespace syncer 32 } // namespace syncer
33 33
34 namespace sync_pb { 34 namespace sync_pb {
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 172
173 // Used to update our local device info once every pulse interval. 173 // Used to update our local device info once every pulse interval.
174 base::OneShotTimer pulse_timer_; 174 base::OneShotTimer pulse_timer_;
175 175
176 DISALLOW_COPY_AND_ASSIGN(DeviceInfoService); 176 DISALLOW_COPY_AND_ASSIGN(DeviceInfoService);
177 }; 177 };
178 178
179 } // namespace syncer 179 } // namespace syncer
180 180
181 #endif // COMPONENTS_SYNC_DEVICE_INFO_DEVICE_INFO_SERVICE_H_ 181 #endif // COMPONENTS_SYNC_DEVICE_INFO_DEVICE_INFO_SERVICE_H_
OLDNEW
« no previous file with comments | « components/sync/device_info/DEPS ('k') | components/sync/device_info/device_info_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698