Upstream version 9.37.197.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / webui / chromeos / login / kiosk_app_menu_handler.cc

diff --git a/src/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc b/src/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc
index 835347a..4ab1f18 100644 (file)
--- a/src/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc
+++ b/src/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc
@@ -6,12 +6,13 @@
 
 #include "base/bind.h"
 #include "base/command_line.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/sys_info.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #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"
@@ -22,14 +23,32 @@
 
 namespace chromeos {
 
-KioskAppMenuHandler::KioskAppMenuHandler()
-    : initialized_(false),
-      weak_ptr_factory_(this) {
+namespace {
+
+// JS functions that define new and old kiosk UI API.
+const char kKioskSetAppsNewAPI[] = "login.AccountPickerScreen.setApps";
+const char kKioskSetAppsOldAPI[] = "login.AppsMenuButton.setApps";
+const char kKioskShowErrorNewAPI[] = "login.AccountPickerScreen.showAppError";
+const char kKioskShowErrorOldAPI[] = "login.AppsMenuButton.showError";
+
+// Default app icon size.
+const char kDefaultAppIconSizeString[] = "96px";
+const int kMaxAppIconSize = 160;
+
+}  // namespace
+
+KioskAppMenuHandler::KioskAppMenuHandler(
+    const scoped_refptr<NetworkStateInformer>& network_state_informer)
+    : weak_ptr_factory_(this),
+      is_webui_initialized_(false),
+      network_state_informer_(network_state_informer) {
   KioskAppManager::Get()->AddObserver(this);
+  network_state_informer_->AddObserver(this);
 }
 
 KioskAppMenuHandler::~KioskAppMenuHandler() {
   KioskAppManager::Get()->RemoveObserver(this);
+  network_state_informer_->RemoveObserver(this);
 }
 
 void KioskAppMenuHandler::GetLocalizedStrings(
@@ -37,6 +56,18 @@ void KioskAppMenuHandler::GetLocalizedStrings(
   localized_strings->SetString(
       "showApps",
       l10n_util::GetStringUTF16(IDS_KIOSK_APPS_BUTTON));
+  localized_strings->SetString(
+      "confirmKioskAppDiagnosticModeFormat",
+      l10n_util::GetStringUTF16(IDS_LOGIN_CONFIRM_KIOSK_DIAGNOSTIC_FORMAT));
+  localized_strings->SetString(
+      "confirmKioskAppDiagnosticModeYes",
+      l10n_util::GetStringUTF16(IDS_CONFIRM_MESSAGEBOX_YES_BUTTON_LABEL));
+  localized_strings->SetString(
+      "confirmKioskAppDiagnosticModeNo",
+      l10n_util::GetStringUTF16(IDS_CONFIRM_MESSAGEBOX_NO_BUTTON_LABEL));
+  localized_strings->SetBoolean(
+      "kioskAppHasLaunchError",
+      KioskAppLaunchError::Get() != KioskAppLaunchError::NONE);
 }
 
 void KioskAppMenuHandler::RegisterMessages() {
@@ -51,8 +82,15 @@ void KioskAppMenuHandler::RegisterMessages() {
                  base::Unretained(this)));
 }
 
+// static
+bool KioskAppMenuHandler::EnableNewKioskUI() {
+  // Turn off new kiosk UI for M34/35.
+  // TODO(xiyuan, nkostylev): Revist for http://crbug.com/362062.
+  return false;
+}
+
 void KioskAppMenuHandler::SendKioskApps() {
-  if (!initialized_)
+  if (!is_webui_initialized_)
     return;
 
   KioskAppManager::Apps apps;
@@ -63,42 +101,43 @@ void KioskAppMenuHandler::SendKioskApps() {
     const KioskAppManager::App& app_data = apps[i];
 
     scoped_ptr<base::DictionaryValue> app_info(new base::DictionaryValue);
+    app_info->SetBoolean("isApp", true);
     app_info->SetString("id", app_data.app_id);
     app_info->SetString("label", app_data.name);
 
     // TODO(xiyuan): Replace data url with a URLDataSource.
     std::string icon_url("chrome://theme/IDR_APP_DEFAULT_ICON");
-    if (!app_data.icon.isNull())
+
+    if (!app_data.icon.isNull()) {
       icon_url = webui::GetBitmapDataUrl(*app_data.icon.bitmap());
+      int width = app_data.icon.width();
+      int height = app_data.icon.height();
+
+      // If app icon size is larger than default 160x160 then don't provide
+      // size at all since it's already limited on the css side.
+      if (width <= kMaxAppIconSize && height <= kMaxAppIconSize) {
+        app_info->SetString("iconWidth", base::IntToString(width) + "px");
+        app_info->SetString("iconHeight", base::IntToString(height) + "px");
+      }
+    } else {
+      app_info->SetString("iconWidth", kDefaultAppIconSizeString);
+      app_info->SetString("iconHeight", kDefaultAppIconSizeString);
+    }
     app_info->SetString("iconUrl", icon_url);
 
     apps_list.Append(app_info.release());
   }
 
-  web_ui()->CallJavascriptFunction("login.AppsMenuButton.setApps",
-                                   apps_list);
+  web_ui()->CallJavascriptFunction(EnableNewKioskUI() ?
+      kKioskSetAppsNewAPI : kKioskSetAppsOldAPI,
+      apps_list);
 }
 
 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;
+  is_webui_initialized_ = true;
   SendKioskApps();
+  UpdateState(ErrorScreenActor::ERROR_REASON_UPDATE);
 }
 
 void KioskAppMenuHandler::HandleKioskAppsLoaded(
@@ -117,8 +156,10 @@ void KioskAppMenuHandler::HandleCheckKioskAppLaunchError(
   KioskAppLaunchError::Clear();
 
   const std::string error_message = KioskAppLaunchError::GetErrorMessage(error);
-  web_ui()->CallJavascriptFunction("login.AppsMenuButton.showError",
-                                   base::StringValue(error_message));
+  bool new_kiosk_ui = EnableNewKioskUI();
+  web_ui()->CallJavascriptFunction(new_kiosk_ui ?
+      kKioskShowErrorNewAPI : kKioskShowErrorOldAPI,
+      base::StringValue(error_message));
 }
 
 void KioskAppMenuHandler::OnKioskAppsSettingsChanged() {
@@ -129,4 +170,9 @@ void KioskAppMenuHandler::OnKioskAppDataChanged(const std::string& app_id) {
   SendKioskApps();
 }
 
+void KioskAppMenuHandler::UpdateState(ErrorScreenActor::ErrorReason reason) {
+  if (network_state_informer_->state() == NetworkStateInformer::ONLINE)
+    KioskAppManager::Get()->RetryFailedAppDataFetch();
+}
+
 }  // namespace chromeos