Index: chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc |
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 835347a779ddba162354925fcdacda0036d91c7b..a6019cb24e40764aacb5eaf515e181584a7cd246 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 |
@@ -11,7 +11,6 @@ |
#include "chrome/browser/chrome_notification_types.h" |
#include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" |
#include "chrome/browser/chromeos/login/existing_user_controller.h" |
-#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
#include "chromeos/chromeos_switches.h" |
#include "content/public/browser/notification_details.h" |
#include "content/public/browser/notification_service.h" |
@@ -23,8 +22,7 @@ |
namespace chromeos { |
KioskAppMenuHandler::KioskAppMenuHandler() |
- : initialized_(false), |
- weak_ptr_factory_(this) { |
+ : weak_ptr_factory_(this) { |
KioskAppManager::Get()->AddObserver(this); |
} |
@@ -52,9 +50,6 @@ void KioskAppMenuHandler::RegisterMessages() { |
} |
void KioskAppMenuHandler::SendKioskApps() { |
- if (!initialized_) |
- return; |
- |
KioskAppManager::Apps apps; |
KioskAppManager::Get()->GetApps(&apps); |
@@ -81,23 +76,6 @@ void KioskAppMenuHandler::SendKioskApps() { |
void KioskAppMenuHandler::HandleInitializeKioskApps( |
const base::ListValue* args) { |
- policy::BrowserPolicyConnectorChromeOS* connector = |
- g_browser_process->platform_part()->browser_policy_connector_chromeos(); |
- if (connector->IsEnterpriseManaged()) { |
- initialized_ = true; |
- SendKioskApps(); |
- return; |
- } |
- |
- KioskAppManager::Get()->GetConsumerKioskModeStatus( |
- base::Bind(&KioskAppMenuHandler::OnGetConsumerKioskModeStatus, |
- weak_ptr_factory_.GetWeakPtr())); |
-} |
- |
-void KioskAppMenuHandler::OnGetConsumerKioskModeStatus( |
- KioskAppManager::ConsumerKioskModeStatus status) { |
- initialized_ = |
- status == KioskAppManager::CONSUMER_KIOSK_MODE_ENABLED; |
SendKioskApps(); |
} |