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

Side by Side Diff: chrome/browser/sync/chrome_sync_client.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 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 #include "chrome/browser/sync/chrome_sync_client.h" 5 #include "chrome/browser/sync/chrome_sync_client.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 #include "components/password_manager/sync/browser/password_model_worker.h" 54 #include "components/password_manager/sync/browser/password_model_worker.h"
55 #include "components/search_engines/search_engine_data_type_controller.h" 55 #include "components/search_engines/search_engine_data_type_controller.h"
56 #include "components/signin/core/browser/profile_oauth2_token_service.h" 56 #include "components/signin/core/browser/profile_oauth2_token_service.h"
57 #include "components/sync/base/report_unrecoverable_error.h" 57 #include "components/sync/base/report_unrecoverable_error.h"
58 #include "components/sync/driver/glue/browser_thread_model_worker.h" 58 #include "components/sync/driver/glue/browser_thread_model_worker.h"
59 #include "components/sync/driver/glue/ui_model_worker.h" 59 #include "components/sync/driver/glue/ui_model_worker.h"
60 #include "components/sync/driver/sync_api_component_factory.h" 60 #include "components/sync/driver/sync_api_component_factory.h"
61 #include "components/sync/driver/sync_util.h" 61 #include "components/sync/driver/sync_util.h"
62 #include "components/sync/driver/ui_data_type_controller.h" 62 #include "components/sync/driver/ui_data_type_controller.h"
63 #include "components/sync/engine/passive_model_worker.h" 63 #include "components/sync/engine/passive_model_worker.h"
64 #include "components/sync_preferences/pref_service_syncable.h"
64 #include "components/sync_sessions/sync_sessions_client.h" 65 #include "components/sync_sessions/sync_sessions_client.h"
65 #include "components/syncable_prefs/pref_service_syncable.h"
66 #include "content/public/browser/browser_thread.h" 66 #include "content/public/browser/browser_thread.h"
67 #include "ui/base/device_form_factor.h" 67 #include "ui/base/device_form_factor.h"
68 68
69 #if BUILDFLAG(ENABLE_APP_LIST) 69 #if BUILDFLAG(ENABLE_APP_LIST)
70 #include "chrome/browser/ui/app_list/app_list_syncable_service.h" 70 #include "chrome/browser/ui/app_list/app_list_syncable_service.h"
71 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h" 71 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"
72 #include "ui/app_list/app_list_switches.h" 72 #include "ui/app_list/app_list_switches.h"
73 #endif 73 #endif
74 74
75 #if defined(ENABLE_EXTENSIONS) 75 #if defined(ENABLE_EXTENSIONS)
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 sync_service->RegisterDataTypeController( 627 sync_service->RegisterDataTypeController(
628 base::MakeUnique<SupervisedUserSyncDataTypeController>( 628 base::MakeUnique<SupervisedUserSyncDataTypeController>(
629 syncer::SUPERVISED_USER_SETTINGS, error_callback, this, profile_)); 629 syncer::SUPERVISED_USER_SETTINGS, error_callback, this, profile_));
630 sync_service->RegisterDataTypeController( 630 sync_service->RegisterDataTypeController(
631 base::MakeUnique<SupervisedUserSyncDataTypeController>( 631 base::MakeUnique<SupervisedUserSyncDataTypeController>(
632 syncer::SUPERVISED_USER_WHITELISTS, error_callback, this, profile_)); 632 syncer::SUPERVISED_USER_WHITELISTS, error_callback, this, profile_));
633 #endif 633 #endif
634 } 634 }
635 635
636 } // namespace browser_sync 636 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698