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

Side by Side Diff: components/sync_driver/glue/sync_backend_host_core.h

Issue 1433473007: [NOT FOR REVIEW] Copy of Max's CL with conflicts fixed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pss_strings
Patch Set: Created 5 years, 1 month 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_GLUE_SYNC_BACKEND_HOST_CORE_H_ 5 #ifndef COMPONENTS_SYNC_DRIVER_GLUE_SYNC_BACKEND_HOST_CORE_H_
6 #define CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_CORE_H_ 6 #define COMPONENTS_SYNC_DRIVER_GLUE_SYNC_BACKEND_HOST_CORE_H_
7 7
8 #include "base/macros.h"
8 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
9
10 #include "base/timer/timer.h" 10 #include "base/timer/timer.h"
11 #include "chrome/browser/sync/glue/sync_backend_host_impl.h"
12 #include "components/invalidation/public/invalidation.h" 11 #include "components/invalidation/public/invalidation.h"
12 #include "components/sync_driver/glue/sync_backend_host_impl.h"
13 #include "components/sync_driver/system_encryptor.h" 13 #include "components/sync_driver/system_encryptor.h"
14 #include "sync/internal_api/public/base/cancelation_signal.h" 14 #include "sync/internal_api/public/base/cancelation_signal.h"
15 #include "sync/internal_api/public/sessions/type_debug_info_observer.h" 15 #include "sync/internal_api/public/sessions/type_debug_info_observer.h"
16 #include "sync/internal_api/public/shutdown_reason.h" 16 #include "sync/internal_api/public/shutdown_reason.h"
17 #include "sync/internal_api/public/sync_encryption_handler.h" 17 #include "sync/internal_api/public/sync_encryption_handler.h"
18 #include "url/gurl.h" 18 #include "url/gurl.h"
19 19
20 namespace browser_sync { 20 namespace browser_sync {
21 21
22 class SyncBackendHostImpl; 22 class SyncBackendHostImpl;
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 // most recently received for that data type. 322 // most recently received for that data type.
323 std::map<syncer::ModelType, int64> last_invalidation_versions_; 323 std::map<syncer::ModelType, int64> last_invalidation_versions_;
324 324
325 base::WeakPtrFactory<SyncBackendHostCore> weak_ptr_factory_; 325 base::WeakPtrFactory<SyncBackendHostCore> weak_ptr_factory_;
326 326
327 DISALLOW_COPY_AND_ASSIGN(SyncBackendHostCore); 327 DISALLOW_COPY_AND_ASSIGN(SyncBackendHostCore);
328 }; 328 };
329 329
330 } // namespace browser_sync 330 } // namespace browser_sync
331 331
332 #endif // CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_CORE_H_ 332 #endif // COMPONENTS_SYNC_DRIVER_GLUE_SYNC_BACKEND_HOST_CORE_H_
OLDNEW
« no previous file with comments | « components/sync_driver/glue/sync_backend_host.cc ('k') | components/sync_driver/glue/sync_backend_host_core.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698