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

Side by Side Diff: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

Issue 2612993002: Make geolocation API and X-Geo header access consistent (Closed)
Patch Set: Fix test / merge error Created 3 years, 11 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/profiles/chrome_browser_main_extra_parts_profiles.h" 5 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 #endif 120 #endif
121 121
122 #if defined(OS_CHROMEOS) 122 #if defined(OS_CHROMEOS)
123 #include "chrome/browser/chromeos/printer_detector/printer_detector_factory.h" 123 #include "chrome/browser/chromeos/printer_detector/printer_detector_factory.h"
124 #include "chrome/browser/chromeos/printing/printer_pref_manager_factory.h" 124 #include "chrome/browser/chromeos/printing/printer_pref_manager_factory.h"
125 #include "chrome/browser/extensions/api/platform_keys/verify_trust_api.h" 125 #include "chrome/browser/extensions/api/platform_keys/verify_trust_api.h"
126 #endif 126 #endif
127 127
128 #if defined(OS_ANDROID) 128 #if defined(OS_ANDROID)
129 #include "chrome/browser/android/data_usage/data_use_ui_tab_model_factory.h" 129 #include "chrome/browser/android/data_usage/data_use_ui_tab_model_factory.h"
130 #include "chrome/browser/android/search_geolocation/search_geolocation_service.h "
130 #else 131 #else
131 #include "chrome/browser/ui/global_error/global_error_service_factory.h" 132 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
132 #include "chrome/browser/usb/usb_chooser_context_factory.h" 133 #include "chrome/browser/usb/usb_chooser_context_factory.h"
133 #endif 134 #endif
134 135
135 #if defined(OS_WIN) 136 #if defined(OS_WIN)
136 #include "chrome/browser/profile_resetter/triggered_profile_resetter_factory.h" 137 #include "chrome/browser/profile_resetter/triggered_profile_resetter_factory.h"
137 #endif 138 #endif
138 139
139 #if BUILDFLAG(ENABLE_SPELLCHECK) 140 #if BUILDFLAG(ENABLE_SPELLCHECK)
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 policy::SchemaRegistryServiceFactory::GetInstance(); 314 policy::SchemaRegistryServiceFactory::GetInstance();
314 policy::UserCloudPolicyInvalidatorFactory::GetInstance(); 315 policy::UserCloudPolicyInvalidatorFactory::GetInstance();
315 predictors::AutocompleteActionPredictorFactory::GetInstance(); 316 predictors::AutocompleteActionPredictorFactory::GetInstance();
316 predictors::PredictorDatabaseFactory::GetInstance(); 317 predictors::PredictorDatabaseFactory::GetInstance();
317 predictors::ResourcePrefetchPredictorFactory::GetInstance(); 318 predictors::ResourcePrefetchPredictorFactory::GetInstance();
318 prerender::PrerenderLinkManagerFactory::GetInstance(); 319 prerender::PrerenderLinkManagerFactory::GetInstance();
319 prerender::PrerenderManagerFactory::GetInstance(); 320 prerender::PrerenderManagerFactory::GetInstance();
320 prerender::PrerenderMessageFilter::EnsureShutdownNotifierFactoryBuilt(); 321 prerender::PrerenderMessageFilter::EnsureShutdownNotifierFactoryBuilt();
321 ProfileSyncServiceFactory::GetInstance(); 322 ProfileSyncServiceFactory::GetInstance();
322 ProtocolHandlerRegistryFactory::GetInstance(); 323 ProtocolHandlerRegistryFactory::GetInstance();
324 #if defined(OS_ANDROID)
325 SearchGeolocationService::Factory::GetInstance();
326 #endif
323 #if BUILDFLAG(ENABLE_SESSION_SERVICE) 327 #if BUILDFLAG(ENABLE_SESSION_SERVICE)
324 SessionServiceFactory::GetInstance(); 328 SessionServiceFactory::GetInstance();
325 #endif 329 #endif
326 ShortcutsBackendFactory::GetInstance(); 330 ShortcutsBackendFactory::GetInstance();
327 SigninManagerFactory::GetInstance(); 331 SigninManagerFactory::GetInstance();
328 332
329 if (SiteEngagementService::IsEnabled()) 333 if (SiteEngagementService::IsEnabled())
330 SiteEngagementServiceFactory::GetInstance(); 334 SiteEngagementServiceFactory::GetInstance();
331 335
332 #if BUILDFLAG(ENABLE_SPELLCHECK) 336 #if BUILDFLAG(ENABLE_SPELLCHECK)
333 SpellcheckServiceFactory::GetInstance(); 337 SpellcheckServiceFactory::GetInstance();
334 #endif 338 #endif
335 suggestions::SuggestionsServiceFactory::GetInstance(); 339 suggestions::SuggestionsServiceFactory::GetInstance();
336 ThumbnailServiceFactory::GetInstance(); 340 ThumbnailServiceFactory::GetInstance();
337 TabRestoreServiceFactory::GetInstance(); 341 TabRestoreServiceFactory::GetInstance();
338 TemplateURLFetcherFactory::GetInstance(); 342 TemplateURLFetcherFactory::GetInstance();
339 TemplateURLServiceFactory::GetInstance(); 343 TemplateURLServiceFactory::GetInstance();
340 #if defined(OS_WIN) 344 #if defined(OS_WIN)
341 TriggeredProfileResetterFactory::GetInstance(); 345 TriggeredProfileResetterFactory::GetInstance();
342 #endif 346 #endif
343 #if !defined(OS_ANDROID) 347 #if !defined(OS_ANDROID)
344 UsbChooserContextFactory::GetInstance(); 348 UsbChooserContextFactory::GetInstance();
345 #endif 349 #endif
346 WebDataServiceFactory::GetInstance(); 350 WebDataServiceFactory::GetInstance();
347 } 351 }
348 352
349 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() { 353 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() {
350 EnsureBrowserContextKeyedServiceFactoriesBuilt(); 354 EnsureBrowserContextKeyedServiceFactoriesBuilt();
351 } 355 }
OLDNEW
« no previous file with comments | « chrome/browser/geolocation/geolocation_permission_context_android.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698