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

Unified Diff: chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: similarity 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 side-by-side diff with in-line comments
Download patch
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 82561cb74398996daf2e113a10506e5b860d7ab6..a00b9e91ac2db68351a2d812a9775f96ffa595f4 100644
--- a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc
+++ b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc
@@ -14,11 +14,11 @@
#include "base/memory/scoped_ptr.h"
#include "base/sys_info.h"
#include "base/values.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/common/extensions/extension_constants.h"
#include "chromeos/chromeos_switches.h"
#include "chromeos/settings/cros_settings_names.h"
+#include "components/user_manager/user_manager.h"
#include "content/public/browser/web_ui.h"
#include "content/public/browser/web_ui_data_source.h"
#include "extensions/common/extension.h"
@@ -198,9 +198,8 @@ void KioskAppsHandler::OnKioskExtensionDownloadFailed(
void KioskAppsHandler::OnGetConsumerKioskAutoLaunchStatus(
chromeos::KioskAppManager::ConsumerKioskAutoLaunchStatus status) {
initialized_ = true;
- is_kiosk_enabled_ =
- chromeos::UserManager::Get()->IsCurrentUserOwner() ||
- !base::SysInfo::IsRunningOnChromeOS();
+ is_kiosk_enabled_ = user_manager::UserManager::Get()->IsCurrentUserOwner() ||
+ !base::SysInfo::IsRunningOnChromeOS();
is_auto_launch_enabled_ =
status == KioskAppManager::CONSUMER_KIOSK_AUTO_LAUNCH_ENABLED ||

Powered by Google App Engine
This is Rietveld 408576698