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

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

Issue 2459823002: [Sync] Rename syncable_prefs to sync_preferences. (Closed)
Patch Set: Created 4 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 (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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 #include "components/sync/engine/sync_encryption_handler.h" 67 #include "components/sync/engine/sync_encryption_handler.h"
68 #include "components/sync/engine/sync_string_conversions.h" 68 #include "components/sync/engine/sync_string_conversions.h"
69 #include "components/sync/js/js_event_details.h" 69 #include "components/sync/js/js_event_details.h"
70 #include "components/sync/model/model_type_change_processor.h" 70 #include "components/sync/model/model_type_change_processor.h"
71 #include "components/sync/model/model_type_store.h" 71 #include "components/sync/model/model_type_store.h"
72 #include "components/sync/model/sync_error.h" 72 #include "components/sync/model/sync_error.h"
73 #include "components/sync/protocol/sync.pb.h" 73 #include "components/sync/protocol/sync.pb.h"
74 #include "components/sync/syncable/directory.h" 74 #include "components/sync/syncable/directory.h"
75 #include "components/sync/syncable/sync_db_util.h" 75 #include "components/sync/syncable/sync_db_util.h"
76 #include "components/sync/syncable/syncable_read_transaction.h" 76 #include "components/sync/syncable/syncable_read_transaction.h"
77 #include "components/sync_preferences/pref_service_syncable.h"
77 #include "components/sync_sessions/favicon_cache.h" 78 #include "components/sync_sessions/favicon_cache.h"
78 #include "components/sync_sessions/session_data_type_controller.h" 79 #include "components/sync_sessions/session_data_type_controller.h"
79 #include "components/sync_sessions/sessions_sync_manager.h" 80 #include "components/sync_sessions/sessions_sync_manager.h"
80 #include "components/sync_sessions/sync_sessions_client.h" 81 #include "components/sync_sessions/sync_sessions_client.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"
84 #include "net/url_request/url_request_context_getter.h" 84 #include "net/url_request/url_request_context_getter.h"
85 #include "ui/base/l10n/l10n_util.h" 85 #include "ui/base/l10n/l10n_util.h"
86 #include "ui/base/l10n/time_format.h" 86 #include "ui/base/l10n/time_format.h"
87 87
88 #if defined(OS_ANDROID) 88 #if defined(OS_ANDROID)
89 #include "components/sync/syncable/read_transaction.h" 89 #include "components/sync/syncable/read_transaction.h"
90 #endif 90 #endif
91 91
(...skipping 2404 matching lines...) Expand 10 before | Expand all | Expand 10 after
2496 2496
2497 DCHECK(startup_controller_->IsSetupInProgress()); 2497 DCHECK(startup_controller_->IsSetupInProgress());
2498 startup_controller_->SetSetupInProgress(false); 2498 startup_controller_->SetSetupInProgress(false);
2499 2499
2500 if (IsBackendInitialized()) 2500 if (IsBackendInitialized())
2501 ReconfigureDatatypeManager(); 2501 ReconfigureDatatypeManager();
2502 NotifyObservers(); 2502 NotifyObservers();
2503 } 2503 }
2504 2504
2505 } // namespace browser_sync 2505 } // namespace browser_sync
OLDNEW
« no previous file with comments | « components/browser_sync/DEPS ('k') | components/browser_sync/profile_sync_service_autofill_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698