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

Side by Side Diff: chrome/browser/sync/chrome_sync_client.cc

Issue 2353213002: arc: Fix Android App resurrected by sync. (Closed)
Patch Set: Address Yury's comment. 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 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 14 matching lines...) Expand all
25 #include "chrome/browser/profiles/profile_manager.h" 25 #include "chrome/browser/profiles/profile_manager.h"
26 #include "chrome/browser/search_engines/template_url_service_factory.h" 26 #include "chrome/browser/search_engines/template_url_service_factory.h"
27 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 27 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
28 #include "chrome/browser/sync/glue/sync_start_util.h" 28 #include "chrome/browser/sync/glue/sync_start_util.h"
29 #include "chrome/browser/sync/glue/theme_data_type_controller.h" 29 #include "chrome/browser/sync/glue/theme_data_type_controller.h"
30 #include "chrome/browser/sync/profile_sync_service_factory.h" 30 #include "chrome/browser/sync/profile_sync_service_factory.h"
31 #include "chrome/browser/sync/sessions/notification_service_sessions_router.h" 31 #include "chrome/browser/sync/sessions/notification_service_sessions_router.h"
32 #include "chrome/browser/themes/theme_service.h" 32 #include "chrome/browser/themes/theme_service.h"
33 #include "chrome/browser/themes/theme_service_factory.h" 33 #include "chrome/browser/themes/theme_service_factory.h"
34 #include "chrome/browser/themes/theme_syncable_service.h" 34 #include "chrome/browser/themes/theme_syncable_service.h"
35 #include "chrome/browser/ui/app_list/arc/arc_package_sync_data_type_controller.h "
36 #include "chrome/browser/ui/sync/browser_synced_window_delegates_getter.h" 35 #include "chrome/browser/ui/sync/browser_synced_window_delegates_getter.h"
37 #include "chrome/browser/undo/bookmark_undo_service_factory.h" 36 #include "chrome/browser/undo/bookmark_undo_service_factory.h"
38 #include "chrome/browser/web_data_service_factory.h" 37 #include "chrome/browser/web_data_service_factory.h"
39 #include "chrome/common/channel_info.h" 38 #include "chrome/common/channel_info.h"
40 #include "chrome/common/features.h" 39 #include "chrome/common/features.h"
41 #include "chrome/common/pref_names.h" 40 #include "chrome/common/pref_names.h"
42 #include "chrome/common/url_constants.h" 41 #include "chrome/common/url_constants.h"
43 #include "components/autofill/core/browser/webdata/autocomplete_syncable_service .h" 42 #include "components/autofill/core/browser/webdata/autocomplete_syncable_service .h"
44 #include "components/autofill/core/browser/webdata/autofill_profile_syncable_ser vice.h" 43 #include "components/autofill/core/browser/webdata/autofill_profile_syncable_ser vice.h"
45 #include "components/autofill/core/browser/webdata/autofill_wallet_metadata_sync able_service.h" 44 #include "components/autofill/core/browser/webdata/autofill_wallet_metadata_sync able_service.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 #if defined(ENABLE_SPELLCHECK) 96 #if defined(ENABLE_SPELLCHECK)
98 #include "chrome/browser/spellchecker/spellcheck_factory.h" 97 #include "chrome/browser/spellchecker/spellcheck_factory.h"
99 #include "chrome/browser/spellchecker/spellcheck_service.h" 98 #include "chrome/browser/spellchecker/spellcheck_service.h"
100 #endif 99 #endif
101 100
102 #if BUILDFLAG(ANDROID_JAVA_UI) 101 #if BUILDFLAG(ANDROID_JAVA_UI)
103 #include "chrome/browser/sync/glue/synced_window_delegates_getter_android.h" 102 #include "chrome/browser/sync/glue/synced_window_delegates_getter_android.h"
104 #endif 103 #endif
105 104
106 #if defined(OS_CHROMEOS) 105 #if defined(OS_CHROMEOS)
106 #include "chrome/browser/ui/app_list/arc/arc_package_sync_data_type_controller.h "
107 #include "chrome/browser/ui/app_list/arc/arc_package_syncable_service.h" 107 #include "chrome/browser/ui/app_list/arc/arc_package_syncable_service.h"
108 #include "components/wifi_sync/wifi_credential_syncable_service.h" 108 #include "components/wifi_sync/wifi_credential_syncable_service.h"
109 #include "components/wifi_sync/wifi_credential_syncable_service_factory.h" 109 #include "components/wifi_sync/wifi_credential_syncable_service_factory.h"
110 #endif 110 #endif
111 111
112 using content::BrowserThread; 112 using content::BrowserThread;
113 #if defined(ENABLE_EXTENSIONS) 113 #if defined(ENABLE_EXTENSIONS)
114 using browser_sync::ExtensionDataTypeController; 114 using browser_sync::ExtensionDataTypeController;
115 using browser_sync::ExtensionSettingDataTypeController; 115 using browser_sync::ExtensionSettingDataTypeController;
116 #endif 116 #endif
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after
628 sync_service->RegisterDataTypeController( 628 sync_service->RegisterDataTypeController(
629 base::MakeUnique<SupervisedUserSyncDataTypeController>( 629 base::MakeUnique<SupervisedUserSyncDataTypeController>(
630 syncer::SUPERVISED_USER_SETTINGS, error_callback, this, profile_)); 630 syncer::SUPERVISED_USER_SETTINGS, error_callback, this, profile_));
631 sync_service->RegisterDataTypeController( 631 sync_service->RegisterDataTypeController(
632 base::MakeUnique<SupervisedUserSyncDataTypeController>( 632 base::MakeUnique<SupervisedUserSyncDataTypeController>(
633 syncer::SUPERVISED_USER_WHITELISTS, error_callback, this, profile_)); 633 syncer::SUPERVISED_USER_WHITELISTS, error_callback, this, profile_));
634 #endif 634 #endif
635 } 635 }
636 636
637 } // namespace browser_sync 637 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698