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

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

Issue 419293002: IME refactoring: ChromeOS introduce input methods State. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tests. Created 6 years, 4 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
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 <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 1242 matching lines...) Expand 10 before | Expand all | Expand 10 after
1253 1253
1254 void ProfileImpl::OnLogin() { 1254 void ProfileImpl::OnLogin() {
1255 if (locale_change_guard_ == NULL) 1255 if (locale_change_guard_ == NULL)
1256 locale_change_guard_.reset(new chromeos::LocaleChangeGuard(this)); 1256 locale_change_guard_.reset(new chromeos::LocaleChangeGuard(this));
1257 locale_change_guard_->OnLogin(); 1257 locale_change_guard_->OnLogin();
1258 } 1258 }
1259 1259
1260 void ProfileImpl::InitChromeOSPreferences() { 1260 void ProfileImpl::InitChromeOSPreferences() {
1261 chromeos_preferences_.reset(new chromeos::Preferences()); 1261 chromeos_preferences_.reset(new chromeos::Preferences());
1262 chromeos_preferences_->Init( 1262 chromeos_preferences_->Init(
1263 PrefServiceSyncable::FromProfile(this), 1263 this, chromeos::ProfileHelper::Get()->GetUserByProfile(this));
1264 chromeos::ProfileHelper::Get()->GetUserByProfile(this));
1265 } 1264 }
1266 1265
1267 #endif // defined(OS_CHROMEOS) 1266 #endif // defined(OS_CHROMEOS)
1268 1267
1269 PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() { 1268 PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() {
1270 if (!pref_proxy_config_tracker_) 1269 if (!pref_proxy_config_tracker_)
1271 pref_proxy_config_tracker_.reset(CreateProxyConfigTracker()); 1270 pref_proxy_config_tracker_.reset(CreateProxyConfigTracker());
1272 return pref_proxy_config_tracker_.get(); 1271 return pref_proxy_config_tracker_.get();
1273 } 1272 }
1274 1273
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
1401 ProfileImpl::CreateDomainReliabilityMonitor() { 1400 ProfileImpl::CreateDomainReliabilityMonitor() {
1402 domain_reliability::DomainReliabilityService* service = 1401 domain_reliability::DomainReliabilityService* service =
1403 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> 1402 domain_reliability::DomainReliabilityServiceFactory::GetInstance()->
1404 GetForBrowserContext(this); 1403 GetForBrowserContext(this);
1405 if (!service) 1404 if (!service)
1406 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); 1405 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>();
1407 1406
1408 return service->CreateMonitor( 1407 return service->CreateMonitor(
1409 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); 1408 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
1410 } 1409 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698