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

Side by Side Diff: chrome/browser/invalidation/profile_invalidation_provider_factory.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
« no previous file with comments | « chrome/browser/intranet_redirect_detector.cc ('k') | chrome/browser/io_thread.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/invalidation/profile_invalidation_provider_factory.h" 5 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/prefs/pref_registry.h"
11 #include "build/build_config.h" 10 #include "build/build_config.h"
12 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h" 13 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
15 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 14 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
16 #include "chrome/browser/signin/signin_manager_factory.h" 15 #include "chrome/browser/signin/signin_manager_factory.h"
17 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" 16 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
18 #include "chrome/common/chrome_content_client.h" 17 #include "chrome/common/chrome_content_client.h"
19 #include "components/gcm_driver/gcm_profile_service.h" 18 #include "components/gcm_driver/gcm_profile_service.h"
20 #include "components/invalidation/impl/invalidation_prefs.h" 19 #include "components/invalidation/impl/invalidation_prefs.h"
21 #include "components/invalidation/impl/invalidation_state_tracker.h" 20 #include "components/invalidation/impl/invalidation_state_tracker.h"
22 #include "components/invalidation/impl/invalidator_storage.h" 21 #include "components/invalidation/impl/invalidator_storage.h"
23 #include "components/invalidation/impl/profile_invalidation_provider.h" 22 #include "components/invalidation/impl/profile_invalidation_provider.h"
24 #include "components/invalidation/impl/ticl_invalidation_service.h" 23 #include "components/invalidation/impl/ticl_invalidation_service.h"
25 #include "components/invalidation/impl/ticl_profile_settings_provider.h" 24 #include "components/invalidation/impl/ticl_profile_settings_provider.h"
26 #include "components/invalidation/impl/ticl_settings_provider.h" 25 #include "components/invalidation/impl/ticl_settings_provider.h"
27 #include "components/invalidation/public/invalidation_service.h" 26 #include "components/invalidation/public/invalidation_service.h"
28 #include "components/keyed_service/content/browser_context_dependency_manager.h" 27 #include "components/keyed_service/content/browser_context_dependency_manager.h"
29 #include "components/pref_registry/pref_registry_syncable.h" 28 #include "components/pref_registry/pref_registry_syncable.h"
29 #include "components/prefs/pref_registry.h"
30 #include "components/signin/core/browser/profile_identity_provider.h" 30 #include "components/signin/core/browser/profile_identity_provider.h"
31 #include "components/signin/core/browser/profile_oauth2_token_service.h" 31 #include "components/signin/core/browser/profile_oauth2_token_service.h"
32 #include "components/signin/core/browser/signin_manager.h" 32 #include "components/signin/core/browser/signin_manager.h"
33 #include "net/url_request/url_request_context_getter.h" 33 #include "net/url_request/url_request_context_getter.h"
34 34
35 #if defined(OS_ANDROID) 35 #if defined(OS_ANDROID)
36 #include "base/android/context_utils.h" 36 #include "base/android/context_utils.h"
37 #include "components/invalidation/impl/invalidation_service_android.h" 37 #include "components/invalidation/impl/invalidation_service_android.h"
38 #endif // defined(OS_ANDROID) 38 #endif // defined(OS_ANDROID)
39 39
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 #endif 139 #endif
140 } 140 }
141 141
142 void ProfileInvalidationProviderFactory::RegisterProfilePrefs( 142 void ProfileInvalidationProviderFactory::RegisterProfilePrefs(
143 user_prefs::PrefRegistrySyncable* registry) { 143 user_prefs::PrefRegistrySyncable* registry) {
144 ProfileInvalidationProvider::RegisterProfilePrefs(registry); 144 ProfileInvalidationProvider::RegisterProfilePrefs(registry);
145 InvalidatorStorage::RegisterProfilePrefs(registry); 145 InvalidatorStorage::RegisterProfilePrefs(registry);
146 } 146 }
147 147
148 } // namespace invalidation 148 } // namespace invalidation
OLDNEW
« no previous file with comments | « chrome/browser/intranet_redirect_detector.cc ('k') | chrome/browser/io_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698