Commit 12ffada4 authored by xiyuan@chromium.org's avatar xiyuan@chromium.org

cros: Don't check consume kiosk flag for enterprise managed device.

BUG=251905

Review URL: https://chromiumcodereview.appspot.com/17503004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207788 0039d316-1c4b-4281-b951-d872f2087c98
parent 42569751
...@@ -7,9 +7,11 @@ ...@@ -7,9 +7,11 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/command_line.h" #include "base/command_line.h"
#include "base/values.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_launch_error.h"
#include "chrome/browser/chromeos/app_mode/kiosk_app_launcher.h" #include "chrome/browser/chromeos/app_mode/kiosk_app_launcher.h"
#include "chrome/browser/chromeos/login/existing_user_controller.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 "chrome/common/chrome_notification_types.h"
#include "chromeos/chromeos_switches.h" #include "chromeos/chromeos_switches.h"
#include "content/public/browser/notification_details.h" #include "content/public/browser/notification_details.h"
...@@ -87,6 +89,12 @@ void KioskAppMenuHandler::SendKioskApps() { ...@@ -87,6 +89,12 @@ void KioskAppMenuHandler::SendKioskApps() {
void KioskAppMenuHandler::HandleInitializeKioskApps( void KioskAppMenuHandler::HandleInitializeKioskApps(
const base::ListValue* args) { const base::ListValue* args) {
if (g_browser_process->browser_policy_connector()->IsEnterpriseManaged()) {
initialized_ = true;
SendKioskApps();
return;
}
KioskAppManager::Get()->GetConsumerKioskModeStatus( KioskAppManager::Get()->GetConsumerKioskModeStatus(
base::Bind(&KioskAppMenuHandler::OnGetConsumerKioskModeStatus, base::Bind(&KioskAppMenuHandler::OnGetConsumerKioskModeStatus,
weak_ptr_factory_.GetWeakPtr())); weak_ptr_factory_.GetWeakPtr()));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment