chrome/browser/extensions/crx_installer.cc - Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager

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/extensions/crx_installer.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase 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:

Index: chrome/browser/extensions/crx_installer.cc

diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc

index 222827192dc547539214074be708a04012e4b75f..9823d4ee82da418992d0892d0b6e33a811c30223 100644

--- a/chrome/browser/extensions/crx_installer.cc

+++ b/chrome/browser/extensions/crx_installer.cc

@@ -63,7 +63,7 @@

#include "ui/base/l10n/l10n_util.h"

#if defined(OS_CHROMEOS)

-#include "chrome/browser/chromeos/login/users/user_manager.h"

+#include "components/user_manager/user_manager.h"

#endif

using base::UserMetricsAction;

@@ -574,7 +574,7 @@ void CrxInstaller::ConfirmInstall() {

if (KioskModeInfo::IsKioskOnly(install_checker_.extension())) {

bool in_kiosk_mode = false;

#if defined(OS_CHROMEOS)

- chromeos::UserManager* user_manager = chromeos::UserManager::Get();

+ user_manager::UserManager* user_manager = user_manager::UserManager::Get();

in_kiosk_mode = user_manager && user_manager->IsLoggedInAsKioskApp();

#endif

if (!in_kiosk_mode) {