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

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

Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/profiles/profile_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_io_data.h" 5 #include "chrome/browser/profiles/profile_io_data.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 params->proxy_config_service 349 params->proxy_config_service
350 .reset(ProxyServiceFactory::CreateProxyConfigService( 350 .reset(ProxyServiceFactory::CreateProxyConfigService(
351 profile->GetProxyConfigTracker())); 351 profile->GetProxyConfigTracker()));
352 #if defined(ENABLE_MANAGED_USERS) 352 #if defined(ENABLE_MANAGED_USERS)
353 SupervisedUserService* supervised_user_service = 353 SupervisedUserService* supervised_user_service =
354 SupervisedUserServiceFactory::GetForProfile(profile); 354 SupervisedUserServiceFactory::GetForProfile(profile);
355 params->supervised_user_url_filter = 355 params->supervised_user_url_filter =
356 supervised_user_service->GetURLFilterForIOThread(); 356 supervised_user_service->GetURLFilterForIOThread();
357 #endif 357 #endif
358 #if defined(OS_CHROMEOS) 358 #if defined(OS_CHROMEOS)
359 chromeos::UserManager* user_manager = chromeos::UserManager::Get(); 359 chromeos::UserManager* user_manager = chromeos::GetUserManager();
360 if (user_manager) { 360 if (user_manager) {
361 chromeos::User* user = 361 chromeos::User* user =
362 chromeos::ProfileHelper::Get()->GetUserByProfile(profile); 362 chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
363 if (user) { 363 if (user) {
364 params->username_hash = user->username_hash(); 364 params->username_hash = user->username_hash();
365 bool is_primary_user = (user_manager->GetPrimaryUser() == user); 365 bool is_primary_user = (user_manager->GetPrimaryUser() == user);
366 BrowserThread::PostTask(BrowserThread::IO, 366 BrowserThread::PostTask(BrowserThread::IO,
367 FROM_HERE, 367 FROM_HERE,
368 base::Bind(&StartNSSInitOnIOThread, 368 base::Bind(&StartNSSInitOnIOThread,
369 user->email(), 369 user->email(),
(...skipping 878 matching lines...) Expand 10 before | Expand all | Expand 10 after
1248 void ProfileIOData::SetCookieSettingsForTesting( 1248 void ProfileIOData::SetCookieSettingsForTesting(
1249 CookieSettings* cookie_settings) { 1249 CookieSettings* cookie_settings) {
1250 DCHECK(!cookie_settings_.get()); 1250 DCHECK(!cookie_settings_.get());
1251 cookie_settings_ = cookie_settings; 1251 cookie_settings_ = cookie_settings;
1252 } 1252 }
1253 1253
1254 void ProfileIOData::set_signin_names_for_testing( 1254 void ProfileIOData::set_signin_names_for_testing(
1255 SigninNamesOnIOThread* signin_names) { 1255 SigninNamesOnIOThread* signin_names) {
1256 signin_names_.reset(signin_names); 1256 signin_names_.reset(signin_names);
1257 } 1257 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/profiles/profile_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698