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

Side by Side Diff: components/browser_sync/browser/profile_sync_service.cc

Issue 2130453004: [Sync] Move //sync to //components/sync. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 4 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 #include "components/browser_sync/browser/profile_sync_service.h" 5 #include "components/browser_sync/browser/profile_sync_service.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8
8 #include <cstddef> 9 #include <cstddef>
9 #include <map> 10 #include <map>
10 #include <utility> 11 #include <utility>
11 #include <vector> 12 #include <vector>
12 13
13 #include "base/bind.h" 14 #include "base/bind.h"
14 #include "base/bind_helpers.h" 15 #include "base/bind_helpers.h"
15 #include "base/callback.h" 16 #include "base/callback.h"
16 #include "base/command_line.h" 17 #include "base/command_line.h"
17 #include "base/compiler_specific.h" 18 #include "base/compiler_specific.h"
(...skipping 16 matching lines...) Expand all
34 #include "components/history/core/browser/typed_url_data_type_controller.h" 35 #include "components/history/core/browser/typed_url_data_type_controller.h"
35 #include "components/invalidation/impl/invalidation_prefs.h" 36 #include "components/invalidation/impl/invalidation_prefs.h"
36 #include "components/invalidation/public/invalidation_service.h" 37 #include "components/invalidation/public/invalidation_service.h"
37 #include "components/pref_registry/pref_registry_syncable.h" 38 #include "components/pref_registry/pref_registry_syncable.h"
38 #include "components/prefs/json_pref_store.h" 39 #include "components/prefs/json_pref_store.h"
39 #include "components/signin/core/browser/about_signin_internals.h" 40 #include "components/signin/core/browser/about_signin_internals.h"
40 #include "components/signin/core/browser/profile_oauth2_token_service.h" 41 #include "components/signin/core/browser/profile_oauth2_token_service.h"
41 #include "components/signin/core/browser/signin_manager.h" 42 #include "components/signin/core/browser/signin_manager.h"
42 #include "components/signin/core/browser/signin_metrics.h" 43 #include "components/signin/core/browser/signin_metrics.h"
43 #include "components/strings/grit/components_strings.h" 44 #include "components/strings/grit/components_strings.h"
45 #include "components/sync/api/model_type_store.h"
46 #include "components/sync/api/sync_error.h"
47 #include "components/sync/base/cryptographer.h"
48 #include "components/sync/base/experiments.h"
49 #include "components/sync/base/stop_source.h"
50 #include "components/sync/base/sync_db_util.h"
51 #include "components/sync/base/sync_string_conversions.h"
52 #include "components/sync/core/configure_reason.h"
53 #include "components/sync/core/http_bridge_network_resources.h"
54 #include "components/sync/core/network_resources.h"
55 #include "components/sync/core/shared_model_type_processor.h"
56 #include "components/sync/core/shutdown_reason.h"
57 #include "components/sync/core/sync_encryption_handler.h"
58 #include "components/sync/js/js_event_details.h"
59 #include "components/sync/protocol/sync.pb.h"
60 #include "components/sync/sessions/model_neutral_state.h"
61 #include "components/sync/sessions/type_debug_info_observer.h"
62 #include "components/sync/syncable/directory.h"
44 #include "components/sync_driver/backend_migrator.h" 63 #include "components/sync_driver/backend_migrator.h"
45 #include "components/sync_driver/change_processor.h" 64 #include "components/sync_driver/change_processor.h"
46 #include "components/sync_driver/data_type_controller.h" 65 #include "components/sync_driver/data_type_controller.h"
47 #include "components/sync_driver/device_info.h" 66 #include "components/sync_driver/device_info.h"
48 #include "components/sync_driver/device_info_service.h" 67 #include "components/sync_driver/device_info_service.h"
49 #include "components/sync_driver/device_info_sync_service.h" 68 #include "components/sync_driver/device_info_sync_service.h"
50 #include "components/sync_driver/device_info_tracker.h" 69 #include "components/sync_driver/device_info_tracker.h"
51 #include "components/sync_driver/glue/chrome_report_unrecoverable_error.h" 70 #include "components/sync_driver/glue/chrome_report_unrecoverable_error.h"
52 #include "components/sync_driver/glue/sync_backend_host.h" 71 #include "components/sync_driver/glue/sync_backend_host.h"
53 #include "components/sync_driver/glue/sync_backend_host_impl.h" 72 #include "components/sync_driver/glue/sync_backend_host_impl.h"
54 #include "components/sync_driver/pref_names.h" 73 #include "components/sync_driver/pref_names.h"
55 #include "components/sync_driver/signin_manager_wrapper.h" 74 #include "components/sync_driver/signin_manager_wrapper.h"
56 #include "components/sync_driver/sync_api_component_factory.h" 75 #include "components/sync_driver/sync_api_component_factory.h"
57 #include "components/sync_driver/sync_client.h" 76 #include "components/sync_driver/sync_client.h"
58 #include "components/sync_driver/sync_driver_switches.h" 77 #include "components/sync_driver/sync_driver_switches.h"
59 #include "components/sync_driver/sync_error_controller.h" 78 #include "components/sync_driver/sync_error_controller.h"
60 #include "components/sync_driver/sync_stopped_reporter.h" 79 #include "components/sync_driver/sync_stopped_reporter.h"
61 #include "components/sync_driver/sync_type_preference_provider.h" 80 #include "components/sync_driver/sync_type_preference_provider.h"
62 #include "components/sync_driver/sync_util.h" 81 #include "components/sync_driver/sync_util.h"
63 #include "components/sync_driver/system_encryptor.h" 82 #include "components/sync_driver/system_encryptor.h"
64 #include "components/sync_driver/user_selectable_sync_type.h" 83 #include "components/sync_driver/user_selectable_sync_type.h"
65 #include "components/sync_sessions/favicon_cache.h" 84 #include "components/sync_sessions/favicon_cache.h"
66 #include "components/sync_sessions/session_data_type_controller.h" 85 #include "components/sync_sessions/session_data_type_controller.h"
67 #include "components/sync_sessions/sessions_sync_manager.h" 86 #include "components/sync_sessions/sessions_sync_manager.h"
68 #include "components/sync_sessions/sync_sessions_client.h" 87 #include "components/sync_sessions/sync_sessions_client.h"
69 #include "components/syncable_prefs/pref_service_syncable.h" 88 #include "components/syncable_prefs/pref_service_syncable.h"
70 #include "components/version_info/version_info_values.h" 89 #include "components/version_info/version_info_values.h"
71 #include "net/cookies/cookie_monster.h" 90 #include "net/cookies/cookie_monster.h"
72 #include "net/url_request/url_request_context_getter.h" 91 #include "net/url_request/url_request_context_getter.h"
73 #include "sync/api/model_type_store.h"
74 #include "sync/api/sync_error.h"
75 #include "sync/internal_api/public/base/stop_source.h"
76 #include "sync/internal_api/public/configure_reason.h"
77 #include "sync/internal_api/public/http_bridge_network_resources.h"
78 #include "sync/internal_api/public/network_resources.h"
79 #include "sync/internal_api/public/sessions/model_neutral_state.h"
80 #include "sync/internal_api/public/sessions/type_debug_info_observer.h"
81 #include "sync/internal_api/public/shared_model_type_processor.h"
82 #include "sync/internal_api/public/shutdown_reason.h"
83 #include "sync/internal_api/public/sync_encryption_handler.h"
84 #include "sync/internal_api/public/util/experiments.h"
85 #include "sync/internal_api/public/util/sync_db_util.h"
86 #include "sync/internal_api/public/util/sync_string_conversions.h"
87 #include "sync/js/js_event_details.h"
88 #include "sync/protocol/sync.pb.h"
89 #include "sync/syncable/directory.h"
90 #include "sync/util/cryptographer.h"
91 #include "ui/base/l10n/l10n_util.h" 92 #include "ui/base/l10n/l10n_util.h"
92 #include "ui/base/l10n/time_format.h" 93 #include "ui/base/l10n/time_format.h"
93 94
94 #if defined(OS_ANDROID) 95 #if defined(OS_ANDROID)
95 #include "sync/internal_api/public/read_transaction.h" 96 #include "components/sync/core/read_transaction.h"
96 #endif 97 #endif
97 98
98 using browser_sync::SessionsSyncManager; 99 using browser_sync::SessionsSyncManager;
99 using browser_sync::SyncBackendHost; 100 using browser_sync::SyncBackendHost;
100 using sync_driver::ChangeProcessor; 101 using sync_driver::ChangeProcessor;
101 using sync_driver::DataTypeController; 102 using sync_driver::DataTypeController;
102 using sync_driver::DataTypeManager; 103 using sync_driver::DataTypeManager;
103 using sync_driver::DataTypeStatusTable; 104 using sync_driver::DataTypeStatusTable;
104 using sync_driver::DeviceInfoSyncService; 105 using sync_driver::DeviceInfoSyncService;
105 using sync_driver_v2::DeviceInfoService; 106 using sync_driver_v2::DeviceInfoService;
(...skipping 2428 matching lines...) Expand 10 before | Expand all | Expand 10 after
2534 if (--outstanding_setup_in_progress_handles_ != 0) 2535 if (--outstanding_setup_in_progress_handles_ != 0)
2535 return; 2536 return;
2536 2537
2537 DCHECK(startup_controller_->IsSetupInProgress()); 2538 DCHECK(startup_controller_->IsSetupInProgress());
2538 startup_controller_->SetSetupInProgress(false); 2539 startup_controller_->SetSetupInProgress(false);
2539 2540
2540 if (IsBackendInitialized()) 2541 if (IsBackendInitialized())
2541 ReconfigureDatatypeManager(); 2542 ReconfigureDatatypeManager();
2542 NotifyObservers(); 2543 NotifyObservers();
2543 } 2544 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698