| OLD | NEW |
| 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 <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 #include "chrome/browser/profiles/gaia_info_update_service_factory.h" | 61 #include "chrome/browser/profiles/gaia_info_update_service_factory.h" |
| 62 #include "chrome/browser/profiles/profile_destroyer.h" | 62 #include "chrome/browser/profiles/profile_destroyer.h" |
| 63 #include "chrome/browser/profiles/profile_info_cache.h" | 63 #include "chrome/browser/profiles/profile_info_cache.h" |
| 64 #include "chrome/browser/profiles/profile_manager.h" | 64 #include "chrome/browser/profiles/profile_manager.h" |
| 65 #include "chrome/browser/profiles/profile_metrics.h" | 65 #include "chrome/browser/profiles/profile_metrics.h" |
| 66 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 66 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
| 67 #include "chrome/browser/services/gcm/gcm_profile_service.h" | 67 #include "chrome/browser/services/gcm/gcm_profile_service.h" |
| 68 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h" | 68 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h" |
| 69 #include "chrome/browser/services/gcm/push_messaging_service_impl.h" | 69 #include "chrome/browser/services/gcm/push_messaging_service_impl.h" |
| 70 #include "chrome/browser/sessions/session_service_factory.h" | 70 #include "chrome/browser/sessions/session_service_factory.h" |
| 71 #include "chrome/browser/signin/signin_ui_util.h" |
| 71 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h" | 72 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h" |
| 72 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h" | 73 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h" |
| 73 #include "chrome/browser/ui/startup/startup_browser_creator.h" | 74 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
| 74 #include "chrome/common/chrome_constants.h" | 75 #include "chrome/common/chrome_constants.h" |
| 75 #include "chrome/common/chrome_paths_internal.h" | 76 #include "chrome/common/chrome_paths_internal.h" |
| 76 #include "chrome/common/chrome_switches.h" | 77 #include "chrome/common/chrome_switches.h" |
| 77 #include "chrome/common/chrome_version_info.h" | 78 #include "chrome/common/chrome_version_info.h" |
| 78 #include "chrome/common/pref_names.h" | 79 #include "chrome/common/pref_names.h" |
| 79 #include "chrome/common/url_constants.h" | 80 #include "chrome/common/url_constants.h" |
| 80 #include "components/bookmarks/browser/bookmark_model.h" | 81 #include "components/bookmarks/browser/bookmark_model.h" |
| (...skipping 634 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 715 content::NotificationService::NoDetails()); | 716 content::NotificationService::NoDetails()); |
| 716 | 717 |
| 717 #if !defined(OS_CHROMEOS) | 718 #if !defined(OS_CHROMEOS) |
| 718 // Listen for bookmark model load, to bootstrap the sync service. | 719 // Listen for bookmark model load, to bootstrap the sync service. |
| 719 // On CrOS sync service will be initialized after sign in. | 720 // On CrOS sync service will be initialized after sign in. |
| 720 BookmarkModel* model = BookmarkModelFactory::GetForProfile(this); | 721 BookmarkModel* model = BookmarkModelFactory::GetForProfile(this); |
| 721 model->AddObserver(new BookmarkModelLoadedObserver(this)); | 722 model->AddObserver(new BookmarkModelLoadedObserver(this)); |
| 722 #endif | 723 #endif |
| 723 | 724 |
| 724 gcm::PushMessagingServiceImpl::InitializeForProfile(this); | 725 gcm::PushMessagingServiceImpl::InitializeForProfile(this); |
| 726 |
| 727 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) && !defined(OS_IOS) |
| 728 signin_ui_util::InitializePrefsForProfile(this); |
| 729 #endif |
| 725 } | 730 } |
| 726 | 731 |
| 727 void ProfileImpl::InitHostZoomMap() { | 732 void ProfileImpl::InitHostZoomMap() { |
| 728 HostZoomMap* host_zoom_map = HostZoomMap::GetForBrowserContext(this); | 733 HostZoomMap* host_zoom_map = HostZoomMap::GetForBrowserContext(this); |
| 729 host_zoom_map->SetDefaultZoomLevel( | 734 host_zoom_map->SetDefaultZoomLevel( |
| 730 prefs_->GetDouble(prefs::kDefaultZoomLevel)); | 735 prefs_->GetDouble(prefs::kDefaultZoomLevel)); |
| 731 | 736 |
| 732 const base::DictionaryValue* host_zoom_dictionary = | 737 const base::DictionaryValue* host_zoom_dictionary = |
| 733 prefs_->GetDictionary(prefs::kPerHostZoomLevels); | 738 prefs_->GetDictionary(prefs::kPerHostZoomLevels); |
| 734 // Careful: The returned value could be NULL if the pref has never been set. | 739 // Careful: The returned value could be NULL if the pref has never been set. |
| (...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1401 ProfileImpl::CreateDomainReliabilityMonitor() { | 1406 ProfileImpl::CreateDomainReliabilityMonitor() { |
| 1402 domain_reliability::DomainReliabilityService* service = | 1407 domain_reliability::DomainReliabilityService* service = |
| 1403 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> | 1408 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> |
| 1404 GetForBrowserContext(this); | 1409 GetForBrowserContext(this); |
| 1405 if (!service) | 1410 if (!service) |
| 1406 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); | 1411 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); |
| 1407 | 1412 |
| 1408 return service->CreateMonitor( | 1413 return service->CreateMonitor( |
| 1409 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); | 1414 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); |
| 1410 } | 1415 } |
| OLD | NEW |