Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/environment.h" | 9 #include "base/environment.h" |
| 10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
| (...skipping 28 matching lines...) Expand all Loading... | |
| 39 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" | 39 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" |
| 40 #include "chrome/browser/history/history.h" | 40 #include "chrome/browser/history/history.h" |
| 41 #include "chrome/browser/history/top_sites.h" | 41 #include "chrome/browser/history/top_sites.h" |
| 42 #include "chrome/browser/instant/instant_controller.h" | 42 #include "chrome/browser/instant/instant_controller.h" |
| 43 #include "chrome/browser/net/chrome_url_request_context.h" | 43 #include "chrome/browser/net/chrome_url_request_context.h" |
| 44 #include "chrome/browser/net/gaia/token_service.h" | 44 #include "chrome/browser/net/gaia/token_service.h" |
| 45 #include "chrome/browser/net/net_pref_observer.h" | 45 #include "chrome/browser/net/net_pref_observer.h" |
| 46 #include "chrome/browser/net/pref_proxy_config_service.h" | 46 #include "chrome/browser/net/pref_proxy_config_service.h" |
| 47 #include "chrome/browser/net/ssl_config_service_manager.h" | 47 #include "chrome/browser/net/ssl_config_service_manager.h" |
| 48 #include "chrome/browser/password_manager/password_store_default.h" | 48 #include "chrome/browser/password_manager/password_store_default.h" |
| 49 #include "chrome/browser/printing/print_preview_data_service_factory.h" | |
|
Lei Zhang
2011/05/27 17:26:53
nit: ordering
kmadhusu
2011/05/27 23:44:42
Ordering LGTM.
| |
| 49 #include "chrome/browser/policy/configuration_policy_pref_store.h" | 50 #include "chrome/browser/policy/configuration_policy_pref_store.h" |
| 50 #include "chrome/browser/policy/configuration_policy_provider.h" | 51 #include "chrome/browser/policy/configuration_policy_provider.h" |
| 51 #include "chrome/browser/policy/profile_policy_connector.h" | 52 #include "chrome/browser/policy/profile_policy_connector.h" |
| 52 #include "chrome/browser/policy/profile_policy_connector_factory.h" | 53 #include "chrome/browser/policy/profile_policy_connector_factory.h" |
| 53 #include "chrome/browser/prefs/browser_prefs.h" | 54 #include "chrome/browser/prefs/browser_prefs.h" |
| 54 #include "chrome/browser/prefs/pref_value_store.h" | 55 #include "chrome/browser/prefs/pref_value_store.h" |
| 55 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 56 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
| 56 #include "chrome/browser/prerender/prerender_manager.h" | 57 #include "chrome/browser/prerender/prerender_manager.h" |
| 57 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" | 58 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" |
| 58 #include "chrome/browser/profiles/profile_dependency_manager.h" | 59 #include "chrome/browser/profiles/profile_dependency_manager.h" |
| (...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 349 // On CrOS sync service will be initialized after sign in. | 350 // On CrOS sync service will be initialized after sign in. |
| 350 registrar_.Add(this, NotificationType::BOOKMARK_MODEL_LOADED, | 351 registrar_.Add(this, NotificationType::BOOKMARK_MODEL_LOADED, |
| 351 Source<Profile>(this)); | 352 Source<Profile>(this)); |
| 352 #endif | 353 #endif |
| 353 | 354 |
| 354 PrefService* local_state = g_browser_process->local_state(); | 355 PrefService* local_state = g_browser_process->local_state(); |
| 355 ssl_config_service_manager_.reset( | 356 ssl_config_service_manager_.reset( |
| 356 SSLConfigServiceManager::CreateDefaultManager(local_state)); | 357 SSLConfigServiceManager::CreateDefaultManager(local_state)); |
| 357 | 358 |
| 358 PinnedTabServiceFactory::GetForProfile(this); | 359 PinnedTabServiceFactory::GetForProfile(this); |
| 360 PrintPreviewDataServiceFactory::GetForProfile(this); | |
|
Elliot Glaysher
2011/05/27 17:45:50
Same.
kmadhusu
2011/05/27 23:44:42
Removed.
| |
| 359 | 361 |
| 360 // Initialize the BackgroundModeManager - this has to be done here before | 362 // Initialize the BackgroundModeManager - this has to be done here before |
| 361 // InitExtensions() is called because it relies on receiving notifications | 363 // InitExtensions() is called because it relies on receiving notifications |
| 362 // when extensions are loaded. BackgroundModeManager is not needed under | 364 // when extensions are loaded. BackgroundModeManager is not needed under |
| 363 // ChromeOS because Chrome is always running (no need for special keep-alive | 365 // ChromeOS because Chrome is always running (no need for special keep-alive |
| 364 // or launch-on-startup support). | 366 // or launch-on-startup support). |
| 365 #if !defined(OS_CHROMEOS) | 367 #if !defined(OS_CHROMEOS) |
| 366 BackgroundModeManagerFactory::GetForProfile(this); | 368 BackgroundModeManagerFactory::GetForProfile(this); |
| 367 #endif | 369 #endif |
| 368 | 370 |
| (...skipping 1278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1647 if (!prerender::PrerenderManager::IsPrerenderingPossible()) | 1649 if (!prerender::PrerenderManager::IsPrerenderingPossible()) |
| 1648 return NULL; | 1650 return NULL; |
| 1649 if (!prerender_manager_.get()) { | 1651 if (!prerender_manager_.get()) { |
| 1650 CHECK(g_browser_process->prerender_tracker()); | 1652 CHECK(g_browser_process->prerender_tracker()); |
| 1651 prerender_manager_.reset( | 1653 prerender_manager_.reset( |
| 1652 new prerender::PrerenderManager( | 1654 new prerender::PrerenderManager( |
| 1653 this, g_browser_process->prerender_tracker())); | 1655 this, g_browser_process->prerender_tracker())); |
| 1654 } | 1656 } |
| 1655 return prerender_manager_.get(); | 1657 return prerender_manager_.get(); |
| 1656 } | 1658 } |
| OLD | NEW |