chrome/browser/invalidation/profile_invalidation_provider_factory.cc - Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/invalidation/profile_invalidation_provider_factory.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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/external_provider_impl.cc ('k') | chrome/browser/invalidation/profile_invalidation_provider_factory_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/invalidation/profile_invalidation_provider_factory.cc

diff --git a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc

index 2f191440497511b4dd4e59cb022ba248c0b3d799..80c6d12190ef61fd27a7e4e26bfc090a4fd4c095 100644

--- a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc

+++ b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc

@@ -53,9 +53,9 @@ ProfileInvalidationProvider* ProfileInvalidationProviderFactory::GetForProfile(

// when this method is called during the creation of the sign-in profile

// itself. Using ProfileHelper::GetSigninProfileDir() is safe because it does

// not try to access the sign-in profile.

- if (profile->GetPath() == chromeos::ProfileHelper::GetSigninProfileDir()||

+ if (profile->GetPath() == chromeos::ProfileHelper::GetSigninProfileDir() ||

(chromeos::UserManager::IsInitialized() &&

- chromeos::UserManager::Get()->IsLoggedInAsGuest())) {

+ chromeos::GetUserManager()->IsLoggedInAsGuest())) {

// The Chrome OS login and Chrome OS guest profiles do not have GAIA

// credentials and do not support invalidation.

return NULL;

@@ -111,7 +111,7 @@ KeyedService* ProfileInvalidationProviderFactory::BuildServiceInstanceFor(

policy::BrowserPolicyConnectorChromeOS* connector =

g_browser_process->platform_part()->browser_policy_connector_chromeos();

if (chromeos::UserManager::IsInitialized() &&

- chromeos::UserManager::Get()->IsLoggedInAsKioskApp() &&

+ chromeos::GetUserManager()->IsLoggedInAsKioskApp() &&

connector->IsEnterpriseManaged()) {

identity_provider.reset(new chromeos::DeviceIdentityProvider(

chromeos::DeviceOAuth2TokenServiceFactory::Get()));