| 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 1259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1270 | 1270 |
| 1271 void ProfileImpl::OnLogin() { | 1271 void ProfileImpl::OnLogin() { |
| 1272 if (locale_change_guard_ == NULL) | 1272 if (locale_change_guard_ == NULL) |
| 1273 locale_change_guard_.reset(new chromeos::LocaleChangeGuard(this)); | 1273 locale_change_guard_.reset(new chromeos::LocaleChangeGuard(this)); |
| 1274 locale_change_guard_->OnLogin(); | 1274 locale_change_guard_->OnLogin(); |
| 1275 } | 1275 } |
| 1276 | 1276 |
| 1277 void ProfileImpl::InitChromeOSPreferences() { | 1277 void ProfileImpl::InitChromeOSPreferences() { |
| 1278 chromeos_preferences_.reset(new chromeos::Preferences()); | 1278 chromeos_preferences_.reset(new chromeos::Preferences()); |
| 1279 chromeos_preferences_->Init( | 1279 chromeos_preferences_->Init( |
| 1280 PrefServiceSyncable::FromProfile(this), | 1280 this, chromeos::ProfileHelper::Get()->GetUserByProfile(this)); |
| 1281 chromeos::ProfileHelper::Get()->GetUserByProfile(this)); | |
| 1282 } | 1281 } |
| 1283 | 1282 |
| 1284 #endif // defined(OS_CHROMEOS) | 1283 #endif // defined(OS_CHROMEOS) |
| 1285 | 1284 |
| 1286 PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() { | 1285 PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() { |
| 1287 if (!pref_proxy_config_tracker_) | 1286 if (!pref_proxy_config_tracker_) |
| 1288 pref_proxy_config_tracker_.reset(CreateProxyConfigTracker()); | 1287 pref_proxy_config_tracker_.reset(CreateProxyConfigTracker()); |
| 1289 return pref_proxy_config_tracker_.get(); | 1288 return pref_proxy_config_tracker_.get(); |
| 1290 } | 1289 } |
| 1291 | 1290 |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1418 ProfileImpl::CreateDomainReliabilityMonitor() { | 1417 ProfileImpl::CreateDomainReliabilityMonitor() { |
| 1419 domain_reliability::DomainReliabilityService* service = | 1418 domain_reliability::DomainReliabilityService* service = |
| 1420 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> | 1419 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> |
| 1421 GetForBrowserContext(this); | 1420 GetForBrowserContext(this); |
| 1422 if (!service) | 1421 if (!service) |
| 1423 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); | 1422 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); |
| 1424 | 1423 |
| 1425 return service->CreateMonitor( | 1424 return service->CreateMonitor( |
| 1426 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); | 1425 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); |
| 1427 } | 1426 } |
| OLD | NEW |