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

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

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
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/profile_sync_service.h" 5 #include "components/browser_sync/profile_sync_service.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <cstddef> 9 #include <cstddef>
10 #include <map> 10 #include <map>
(...skipping 19 matching lines...) Expand all
30 #include "components/history/core/browser/typed_url_data_type_controller.h" 30 #include "components/history/core/browser/typed_url_data_type_controller.h"
31 #include "components/invalidation/impl/invalidation_prefs.h" 31 #include "components/invalidation/impl/invalidation_prefs.h"
32 #include "components/invalidation/public/invalidation_service.h" 32 #include "components/invalidation/public/invalidation_service.h"
33 #include "components/pref_registry/pref_registry_syncable.h" 33 #include "components/pref_registry/pref_registry_syncable.h"
34 #include "components/prefs/json_pref_store.h" 34 #include "components/prefs/json_pref_store.h"
35 #include "components/signin/core/browser/about_signin_internals.h" 35 #include "components/signin/core/browser/about_signin_internals.h"
36 #include "components/signin/core/browser/profile_oauth2_token_service.h" 36 #include "components/signin/core/browser/profile_oauth2_token_service.h"
37 #include "components/signin/core/browser/signin_manager.h" 37 #include "components/signin/core/browser/signin_manager.h"
38 #include "components/signin/core/browser/signin_metrics.h" 38 #include "components/signin/core/browser/signin_metrics.h"
39 #include "components/strings/grit/components_strings.h" 39 #include "components/strings/grit/components_strings.h"
40 #include "components/sync/api/model_type_store.h"
41 #include "components/sync/api/sync_error.h"
42 #include "components/sync/base/bind_to_task_runner.h" 40 #include "components/sync/base/bind_to_task_runner.h"
43 #include "components/sync/base/cryptographer.h" 41 #include "components/sync/base/cryptographer.h"
44 #include "components/sync/base/passphrase_type.h" 42 #include "components/sync/base/passphrase_type.h"
45 #include "components/sync/base/pref_names.h" 43 #include "components/sync/base/pref_names.h"
46 #include "components/sync/base/report_unrecoverable_error.h" 44 #include "components/sync/base/report_unrecoverable_error.h"
47 #include "components/sync/base/stop_source.h" 45 #include "components/sync/base/stop_source.h"
48 #include "components/sync/base/sync_db_util.h" 46 #include "components/sync/base/sync_db_util.h"
49 #include "components/sync/base/system_encryptor.h" 47 #include "components/sync/base/system_encryptor.h"
50 #include "components/sync/core/configure_reason.h" 48 #include "components/sync/core/configure_reason.h"
51 #include "components/sync/core/http_bridge_network_resources.h" 49 #include "components/sync/core/http_bridge_network_resources.h"
(...skipping 12 matching lines...) Expand all
64 #include "components/sync/driver/sync_api_component_factory.h" 62 #include "components/sync/driver/sync_api_component_factory.h"
65 #include "components/sync/driver/sync_driver_switches.h" 63 #include "components/sync/driver/sync_driver_switches.h"
66 #include "components/sync/driver/sync_error_controller.h" 64 #include "components/sync/driver/sync_error_controller.h"
67 #include "components/sync/driver/sync_type_preference_provider.h" 65 #include "components/sync/driver/sync_type_preference_provider.h"
68 #include "components/sync/driver/sync_util.h" 66 #include "components/sync/driver/sync_util.h"
69 #include "components/sync/driver/user_selectable_sync_type.h" 67 #include "components/sync/driver/user_selectable_sync_type.h"
70 #include "components/sync/engine/cycle/model_neutral_state.h" 68 #include "components/sync/engine/cycle/model_neutral_state.h"
71 #include "components/sync/engine/cycle/type_debug_info_observer.h" 69 #include "components/sync/engine/cycle/type_debug_info_observer.h"
72 #include "components/sync/engine/sync_string_conversions.h" 70 #include "components/sync/engine/sync_string_conversions.h"
73 #include "components/sync/js/js_event_details.h" 71 #include "components/sync/js/js_event_details.h"
72 #include "components/sync/model/model_type_store.h"
73 #include "components/sync/model/sync_error.h"
74 #include "components/sync/protocol/sync.pb.h" 74 #include "components/sync/protocol/sync.pb.h"
75 #include "components/sync/syncable/directory.h" 75 #include "components/sync/syncable/directory.h"
76 #include "components/sync/syncable/syncable_read_transaction.h" 76 #include "components/sync/syncable/syncable_read_transaction.h"
77 #include "components/sync_sessions/favicon_cache.h" 77 #include "components/sync_sessions/favicon_cache.h"
78 #include "components/sync_sessions/session_data_type_controller.h" 78 #include "components/sync_sessions/session_data_type_controller.h"
79 #include "components/sync_sessions/sessions_sync_manager.h" 79 #include "components/sync_sessions/sessions_sync_manager.h"
80 #include "components/sync_sessions/sync_sessions_client.h" 80 #include "components/sync_sessions/sync_sessions_client.h"
81 #include "components/syncable_prefs/pref_service_syncable.h" 81 #include "components/syncable_prefs/pref_service_syncable.h"
82 #include "components/version_info/version_info_values.h" 82 #include "components/version_info/version_info_values.h"
83 #include "net/cookies/cookie_monster.h" 83 #include "net/cookies/cookie_monster.h"
(...skipping 2414 matching lines...) Expand 10 before | Expand all | Expand 10 after
2498 2498
2499 DCHECK(startup_controller_->IsSetupInProgress()); 2499 DCHECK(startup_controller_->IsSetupInProgress());
2500 startup_controller_->SetSetupInProgress(false); 2500 startup_controller_->SetSetupInProgress(false);
2501 2501
2502 if (IsBackendInitialized()) 2502 if (IsBackendInitialized())
2503 ReconfigureDatatypeManager(); 2503 ReconfigureDatatypeManager();
2504 NotifyObservers(); 2504 NotifyObservers();
2505 } 2505 }
2506 2506
2507 } // namespace browser_sync 2507 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698