Represent kiosk apps as user pods instead of menu items.

chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h"
 
 #include "base/bind.h"
 #include "base/command_line.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 "chromeos/chromeos_switches.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/webui/web_ui_util.h"
 
 namespace chromeos {
 
+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";
+
+}  // namespace
+
 KioskAppMenuHandler::KioskAppMenuHandler()
-    : weak_ptr_factory_(this) {
+    : weak_ptr_factory_(this),
+      is_webui_initialized_(false) {
   KioskAppManager::Get()->AddObserver(this);
 }
 
 KioskAppMenuHandler::~KioskAppMenuHandler() {
   KioskAppManager::Get()->RemoveObserver(this);
 }
 
 void KioskAppMenuHandler::GetLocalizedStrings(
     base::DictionaryValue* localized_strings) {
   localized_strings->SetString(
@@ skipping 16 matching lines @@
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("kioskAppsLoaded",
       base::Bind(&KioskAppMenuHandler::HandleKioskAppsLoaded,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("checkKioskAppLaunchError",
       base::Bind(&KioskAppMenuHandler::HandleCheckKioskAppLaunchError,
                  base::Unretained(this)));
 }
 
 void KioskAppMenuHandler::SendKioskApps() {
+  if (!is_webui_initialized_)
+    return;
+
   KioskAppManager::Apps apps;
   KioskAppManager::Get()->GetApps(&apps);
 
   base::ListValue apps_list;
   for (size_t i = 0; i < apps.size(); ++i) {
     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())
       icon_url = webui::GetBitmapDataUrl(*app_data.icon.bitmap());
     app_info->SetString("iconUrl", icon_url);
 
     apps_list.Append(app_info.release());
   }
 
-  web_ui()->CallJavascriptFunction("login.AppsMenuButton.setApps",
-                                   apps_list);
+  bool new_kiosk_ui = !CommandLine::ForCurrentProcess()->
+      HasSwitch(switches::kDisableNewKioskUI);
+  web_ui()->CallJavascriptFunction(new_kiosk_ui ?
+      kKioskSetAppsNewAPI : kKioskSetAppsOldAPI,
+      apps_list);
 }
 
 void KioskAppMenuHandler::HandleInitializeKioskApps(
     const base::ListValue* args) {
+  is_webui_initialized_ = true;
   SendKioskApps();
 }
 
 void KioskAppMenuHandler::HandleKioskAppsLoaded(
     const base::ListValue* args) {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_KIOSK_APPS_LOADED,
       content::NotificationService::AllSources(),
       content::NotificationService::NoDetails());
 }
 
 void KioskAppMenuHandler::HandleCheckKioskAppLaunchError(
     const base::ListValue* args) {
   KioskAppLaunchError::Error error = KioskAppLaunchError::Get();
   if (error == KioskAppLaunchError::NONE)
     return;
   KioskAppLaunchError::Clear();
 
   const std::string error_message = KioskAppLaunchError::GetErrorMessage(error);
-  web_ui()->CallJavascriptFunction("login.AppsMenuButton.showError",
-                                   base::StringValue(error_message));
+  bool new_kiosk_ui = !CommandLine::ForCurrentProcess()->
+      HasSwitch(switches::kDisableNewKioskUI);
+  web_ui()->CallJavascriptFunction(new_kiosk_ui ?
+      kKioskShowErrorNewAPI : kKioskShowErrorOldAPI,
+      base::StringValue(error_message));
 }
 
 void KioskAppMenuHandler::OnKioskAppsSettingsChanged() {
   SendKioskApps();
 }
 
 void KioskAppMenuHandler::OnKioskAppDataChanged(const std::string& app_id) {
   SendKioskApps();
 }
 
 }  // namespace chromeos