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 1208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1219 | 1219 |
1220 void ProfileImpl::OnLogin() { | 1220 void ProfileImpl::OnLogin() { |
1221 if (locale_change_guard_ == NULL) | 1221 if (locale_change_guard_ == NULL) |
1222 locale_change_guard_.reset(new chromeos::LocaleChangeGuard(this)); | 1222 locale_change_guard_.reset(new chromeos::LocaleChangeGuard(this)); |
1223 locale_change_guard_->OnLogin(); | 1223 locale_change_guard_->OnLogin(); |
1224 } | 1224 } |
1225 | 1225 |
1226 void ProfileImpl::InitChromeOSPreferences() { | 1226 void ProfileImpl::InitChromeOSPreferences() { |
1227 chromeos_preferences_.reset(new chromeos::Preferences()); | 1227 chromeos_preferences_.reset(new chromeos::Preferences()); |
1228 chromeos_preferences_->Init( | 1228 chromeos_preferences_->Init( |
1229 PrefServiceSyncable::FromProfile(this), | 1229 this, chromeos::ProfileHelper::Get()->GetUserByProfile(this)); |
1230 chromeos::ProfileHelper::Get()->GetUserByProfile(this)); | |
1231 } | 1230 } |
1232 | 1231 |
1233 #endif // defined(OS_CHROMEOS) | 1232 #endif // defined(OS_CHROMEOS) |
1234 | 1233 |
1235 PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() { | 1234 PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() { |
1236 if (!pref_proxy_config_tracker_) | 1235 if (!pref_proxy_config_tracker_) |
1237 pref_proxy_config_tracker_.reset(CreateProxyConfigTracker()); | 1236 pref_proxy_config_tracker_.reset(CreateProxyConfigTracker()); |
1238 return pref_proxy_config_tracker_.get(); | 1237 return pref_proxy_config_tracker_.get(); |
1239 } | 1238 } |
1240 | 1239 |
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1367 ProfileImpl::CreateDomainReliabilityMonitor() { | 1366 ProfileImpl::CreateDomainReliabilityMonitor() { |
1368 domain_reliability::DomainReliabilityService* service = | 1367 domain_reliability::DomainReliabilityService* service = |
1369 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> | 1368 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> |
1370 GetForBrowserContext(this); | 1369 GetForBrowserContext(this); |
1371 if (!service) | 1370 if (!service) |
1372 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); | 1371 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); |
1373 | 1372 |
1374 return service->CreateMonitor( | 1373 return service->CreateMonitor( |
1375 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); | 1374 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); |
1376 } | 1375 } |
OLD | NEW |