diff options
| -rw-r--r-- | chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc b/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc index fa23a06..1fdc155 100644 --- a/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc @@ -7,9 +7,11 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/values.h" +#include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" #include "chrome/browser/chromeos/app_mode/kiosk_app_launcher.h" #include "chrome/browser/chromeos/login/existing_user_controller.h" +#include "chrome/browser/policy/browser_policy_connector.h" #include "chrome/common/chrome_notification_types.h" #include "chromeos/chromeos_switches.h" #include "content/public/browser/notification_details.h" @@ -87,6 +89,12 @@ void KioskAppMenuHandler::SendKioskApps() { void KioskAppMenuHandler::HandleInitializeKioskApps( const base::ListValue* args) { + if (g_browser_process->browser_policy_connector()->IsEnterpriseManaged()) { + initialized_ = true; + SendKioskApps(); + return; + } + KioskAppManager::Get()->GetConsumerKioskModeStatus( base::Bind(&KioskAppMenuHandler::OnGetConsumerKioskModeStatus, weak_ptr_factory_.GetWeakPtr())); |