chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.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/ui/webui/extensions/chromeos/kiosk_apps_handler.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:

Index: chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc

diff --git a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc

index ad7fa148b2a57af14224a71b7962c99a20598631..c2c9b5af9e78a9242de9beb85a5ce5a32c2a50e9 100644

--- a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc

+++ b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc

@@ -201,9 +201,8 @@ void KioskAppsHandler::OnKioskAppDataLoadFailure(const std::string& app_id) {

void KioskAppsHandler::OnGetConsumerKioskAutoLaunchStatus(

chromeos::KioskAppManager::ConsumerKioskAutoLaunchStatus status) {

initialized_ = true;

- is_kiosk_enabled_ =

- chromeos::UserManager::Get()->IsCurrentUserOwner() ||

- !base::SysInfo::IsRunningOnChromeOS();

+ is_kiosk_enabled_ = chromeos::GetUserManager()->IsCurrentUserOwner() ||

+ !base::SysInfo::IsRunningOnChromeOS();

is_auto_launch_enabled_ =

status == KioskAppManager::CONSUMER_KIOSK_AUTO_LAUNCH_ENABLED ||