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

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

Issue 1786263002: Remove uses of ENABLE_CONFIGURATION_POLICY from src/chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sort Created 4 years, 9 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/profiles/profile_impl.h ('k') | chrome/browser/profiles/profile_io_data.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 (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 "chrome/browser/profiles/profile_impl.h" 5 #include "chrome/browser/profiles/profile_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 #include "chrome/browser/download/download_service_factory.h" 44 #include "chrome/browser/download/download_service_factory.h"
45 #include "chrome/browser/net/net_pref_observer.h" 45 #include "chrome/browser/net/net_pref_observer.h"
46 #include "chrome/browser/net/predictor.h" 46 #include "chrome/browser/net/predictor.h"
47 #include "chrome/browser/net/proxy_service_factory.h" 47 #include "chrome/browser/net/proxy_service_factory.h"
48 #include "chrome/browser/permissions/permission_manager.h" 48 #include "chrome/browser/permissions/permission_manager.h"
49 #include "chrome/browser/permissions/permission_manager_factory.h" 49 #include "chrome/browser/permissions/permission_manager_factory.h"
50 #include "chrome/browser/plugins/chrome_plugin_service_filter.h" 50 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
51 #include "chrome/browser/plugins/plugin_prefs.h" 51 #include "chrome/browser/plugins/plugin_prefs.h"
52 #include "chrome/browser/policy/profile_policy_connector.h" 52 #include "chrome/browser/policy/profile_policy_connector.h"
53 #include "chrome/browser/policy/profile_policy_connector_factory.h" 53 #include "chrome/browser/policy/profile_policy_connector_factory.h"
54 #include "chrome/browser/policy/schema_registry_service.h"
55 #include "chrome/browser/policy/schema_registry_service_factory.h"
54 #include "chrome/browser/prefs/browser_prefs.h" 56 #include "chrome/browser/prefs/browser_prefs.h"
55 #include "chrome/browser/prefs/chrome_pref_service_factory.h" 57 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
56 #include "chrome/browser/prefs/pref_service_syncable_util.h" 58 #include "chrome/browser/prefs/pref_service_syncable_util.h"
57 #include "chrome/browser/prerender/prerender_manager_factory.h" 59 #include "chrome/browser/prerender/prerender_manager_factory.h"
58 #include "chrome/browser/profiles/bookmark_model_loaded_observer.h" 60 #include "chrome/browser/profiles/bookmark_model_loaded_observer.h"
59 #include "chrome/browser/profiles/chrome_version_service.h" 61 #include "chrome/browser/profiles/chrome_version_service.h"
60 #include "chrome/browser/profiles/gaia_info_update_service_factory.h" 62 #include "chrome/browser/profiles/gaia_info_update_service_factory.h"
61 #include "chrome/browser/profiles/profile_destroyer.h" 63 #include "chrome/browser/profiles/profile_destroyer.h"
62 #include "chrome/browser/profiles/profile_info_cache.h" 64 #include "chrome/browser/profiles/profile_info_cache.h"
63 #include "chrome/browser/profiles/profile_manager.h" 65 #include "chrome/browser/profiles/profile_manager.h"
(...skipping 16 matching lines...) Expand all
80 #include "chrome/grit/chromium_strings.h" 82 #include "chrome/grit/chromium_strings.h"
81 #include "components/bookmarks/browser/bookmark_model.h" 83 #include "components/bookmarks/browser/bookmark_model.h"
82 #include "components/content_settings/core/browser/cookie_settings.h" 84 #include "components/content_settings/core/browser/cookie_settings.h"
83 #include "components/content_settings/core/browser/host_content_settings_map.h" 85 #include "components/content_settings/core/browser/host_content_settings_map.h"
84 #include "components/domain_reliability/monitor.h" 86 #include "components/domain_reliability/monitor.h"
85 #include "components/domain_reliability/service.h" 87 #include "components/domain_reliability/service.h"
86 #include "components/gcm_driver/gcm_profile_service.h" 88 #include "components/gcm_driver/gcm_profile_service.h"
87 #include "components/keyed_service/content/browser_context_dependency_manager.h" 89 #include "components/keyed_service/content/browser_context_dependency_manager.h"
88 #include "components/metrics/metrics_service.h" 90 #include "components/metrics/metrics_service.h"
89 #include "components/omnibox/browser/autocomplete_classifier.h" 91 #include "components/omnibox/browser/autocomplete_classifier.h"
92 #include "components/policy/core/browser/browser_policy_connector.h"
90 #include "components/pref_registry/pref_registry_syncable.h" 93 #include "components/pref_registry/pref_registry_syncable.h"
91 #include "components/prefs/json_pref_store.h" 94 #include "components/prefs/json_pref_store.h"
92 #include "components/prefs/scoped_user_pref_update.h" 95 #include "components/prefs/scoped_user_pref_update.h"
93 #include "components/proxy_config/pref_proxy_config_tracker.h" 96 #include "components/proxy_config/pref_proxy_config_tracker.h"
94 #include "components/signin/core/browser/signin_manager.h" 97 #include "components/signin/core/browser/signin_manager.h"
95 #include "components/signin/core/common/signin_pref_names.h" 98 #include "components/signin/core/common/signin_pref_names.h"
96 #include "components/ssl_config/ssl_config_service_manager.h" 99 #include "components/ssl_config/ssl_config_service_manager.h"
97 #include "components/syncable_prefs/pref_service_syncable.h" 100 #include "components/syncable_prefs/pref_service_syncable.h"
98 #include "components/ui/zoom/zoom_event_manager.h" 101 #include "components/ui/zoom/zoom_event_manager.h"
99 #include "components/url_formatter/url_fixer.h" 102 #include "components/url_formatter/url_fixer.h"
(...skipping 19 matching lines...) Expand all
119 #include "chrome/browser/chromeos/locale_change_guard.h" 122 #include "chrome/browser/chromeos/locale_change_guard.h"
120 #include "chrome/browser/chromeos/preferences.h" 123 #include "chrome/browser/chromeos/preferences.h"
121 #include "chrome/browser/chromeos/profiles/profile_helper.h" 124 #include "chrome/browser/chromeos/profiles/profile_helper.h"
122 #include "components/user_manager/user_manager.h" 125 #include "components/user_manager/user_manager.h"
123 #endif 126 #endif
124 127
125 #if BUILDFLAG(ENABLE_BACKGROUND) 128 #if BUILDFLAG(ENABLE_BACKGROUND)
126 #include "chrome/browser/background/background_mode_manager.h" 129 #include "chrome/browser/background/background_mode_manager.h"
127 #endif 130 #endif
128 131
129 #if defined(ENABLE_CONFIGURATION_POLICY)
130 #include "chrome/browser/policy/schema_registry_service.h"
131 #include "chrome/browser/policy/schema_registry_service_factory.h"
132 #include "components/policy/core/browser/browser_policy_connector.h"
133 #if defined(OS_CHROMEOS) 132 #if defined(OS_CHROMEOS)
134 #include "chrome/browser/chromeos/login/session/user_session_manager.h" 133 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
135 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" 134 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
136 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h" 135 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h"
137 #else 136 #else
138 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" 137 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
139 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" 138 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
140 #endif 139 #endif
141 #endif
142 140
143 #if defined(ENABLE_EXTENSIONS) 141 #if defined(ENABLE_EXTENSIONS)
144 #include "chrome/browser/extensions/extension_service.h" 142 #include "chrome/browser/extensions/extension_service.h"
145 #include "chrome/browser/extensions/extension_special_storage_policy.h" 143 #include "chrome/browser/extensions/extension_special_storage_policy.h"
146 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 144 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
147 #include "components/guest_view/browser/guest_view_manager.h" 145 #include "components/guest_view/browser/guest_view_manager.h"
148 #include "extensions/browser/extension_pref_store.h" 146 #include "extensions/browser/extension_pref_store.h"
149 #include "extensions/browser/extension_pref_value_map.h" 147 #include "extensions/browser/extension_pref_value_map.h"
150 #include "extensions/browser/extension_pref_value_map_factory.h" 148 #include "extensions/browser/extension_pref_value_map_factory.h"
151 #include "extensions/browser/extension_system.h" 149 #include "extensions/browser/extension_system.h"
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 const base::CommandLine* command_line = 398 const base::CommandLine* command_line =
401 base::CommandLine::ForCurrentProcess(); 399 base::CommandLine::ForCurrentProcess();
402 predictor_ = chrome_browser_net::Predictor::CreatePredictor( 400 predictor_ = chrome_browser_net::Predictor::CreatePredictor(
403 !command_line->HasSwitch(switches::kDisablePreconnect), 401 !command_line->HasSwitch(switches::kDisablePreconnect),
404 !command_line->HasSwitch(switches::kDnsPrefetchDisable), 402 !command_line->HasSwitch(switches::kDnsPrefetchDisable),
405 g_browser_process->profile_manager() == NULL); 403 g_browser_process->profile_manager() == NULL);
406 404
407 // If we are creating the profile synchronously, then we should load the 405 // If we are creating the profile synchronously, then we should load the
408 // policy data immediately. 406 // policy data immediately.
409 bool force_immediate_policy_load = (create_mode == CREATE_MODE_SYNCHRONOUS); 407 bool force_immediate_policy_load = (create_mode == CREATE_MODE_SYNCHRONOUS);
410 #if defined(ENABLE_CONFIGURATION_POLICY)
411 policy::BrowserPolicyConnector* connector = 408 policy::BrowserPolicyConnector* connector =
412 g_browser_process->browser_policy_connector(); 409 g_browser_process->browser_policy_connector();
413 schema_registry_service_ = 410 schema_registry_service_ =
414 policy::SchemaRegistryServiceFactory::CreateForContext( 411 policy::SchemaRegistryServiceFactory::CreateForContext(
415 this, connector->GetChromeSchema(), connector->GetSchemaRegistry()); 412 this, connector->GetChromeSchema(), connector->GetSchemaRegistry());
416 #if defined(OS_CHROMEOS) 413 #if defined(OS_CHROMEOS)
417 cloud_policy_manager_ = 414 cloud_policy_manager_ =
418 policy::UserCloudPolicyManagerFactoryChromeOS::CreateForProfile( 415 policy::UserCloudPolicyManagerFactoryChromeOS::CreateForProfile(
419 this, force_immediate_policy_load, sequenced_task_runner); 416 this, force_immediate_policy_load, sequenced_task_runner);
420 #else 417 #else
421 cloud_policy_manager_ = 418 cloud_policy_manager_ =
422 policy::UserCloudPolicyManagerFactory::CreateForOriginalBrowserContext( 419 policy::UserCloudPolicyManagerFactory::CreateForOriginalBrowserContext(
423 this, 420 this,
424 force_immediate_policy_load, 421 force_immediate_policy_load,
425 sequenced_task_runner, 422 sequenced_task_runner,
426 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE), 423 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE),
427 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); 424 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
428 #endif 425 #endif
429 #endif
430 profile_policy_connector_ = 426 profile_policy_connector_ =
431 policy::ProfilePolicyConnectorFactory::CreateForBrowserContext( 427 policy::ProfilePolicyConnectorFactory::CreateForBrowserContext(
432 this, force_immediate_policy_load); 428 this, force_immediate_policy_load);
433 429
434 DCHECK(create_mode == CREATE_MODE_ASYNCHRONOUS || 430 DCHECK(create_mode == CREATE_MODE_ASYNCHRONOUS ||
435 create_mode == CREATE_MODE_SYNCHRONOUS); 431 create_mode == CREATE_MODE_SYNCHRONOUS);
436 bool async_prefs = create_mode == CREATE_MODE_ASYNCHRONOUS; 432 bool async_prefs = create_mode == CREATE_MODE_ASYNCHRONOUS;
437 433
438 #if defined(OS_CHROMEOS) 434 #if defined(OS_CHROMEOS)
439 if (chromeos::ProfileHelper::IsSigninProfile(this)) 435 if (chromeos::ProfileHelper::IsSigninProfile(this))
(...skipping 841 matching lines...) Expand 10 before | Expand all | Expand 10 after
1281 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { 1277 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) {
1282 domain_reliability::DomainReliabilityService* service = 1278 domain_reliability::DomainReliabilityService* service =
1283 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> 1279 domain_reliability::DomainReliabilityServiceFactory::GetInstance()->
1284 GetForBrowserContext(this); 1280 GetForBrowserContext(this);
1285 if (!service) 1281 if (!service)
1286 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); 1282 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>();
1287 1283
1288 return service->CreateMonitor( 1284 return service->CreateMonitor(
1289 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); 1285 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
1290 } 1286 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl.h ('k') | chrome/browser/profiles/profile_io_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698