Add ARC++ kiosk menu items and ability to start kiosk session.

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 <stddef.h>
 
 #include <utility>
 
 #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/arc/arc_kiosk_app_manager.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/login/screens/network_error.h"
 #include "chrome/grit/generated_resources.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 "extensions/grit/extensions_browser_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 12 matching lines @@
 
 }  // namespace
 
 KioskAppMenuHandler::KioskAppMenuHandler(
     const scoped_refptr<NetworkStateInformer>& network_state_informer)
     : is_webui_initialized_(false),
       network_state_informer_(network_state_informer),
       weak_ptr_factory_(this) {
   KioskAppManager::Get()->AddObserver(this);
   network_state_informer_->AddObserver(this);
+  ArcKioskAppManager::Get()->AddObserver(this);
 }
 
 KioskAppMenuHandler::~KioskAppMenuHandler() {
   KioskAppManager::Get()->RemoveObserver(this);
   network_state_informer_->RemoveObserver(this);
+  ArcKioskAppManager::Get()->RemoveObserver(this);
 }
 
 void KioskAppMenuHandler::GetLocalizedStrings(
     base::DictionaryValue* localized_strings) {
   localized_strings->SetString(
       "showApps",
       l10n_util::GetStringUTF16(IDS_KIOSK_APPS_BUTTON));
   localized_strings->SetString(
       "confirmKioskAppDiagnosticModeFormat",
       l10n_util::GetStringUTF16(IDS_LOGIN_CONFIRM_KIOSK_DIAGNOSTIC_FORMAT));
@@ skipping 34 matching lines @@
   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];
 
     std::unique_ptr<base::DictionaryValue> app_info(new base::DictionaryValue);
     app_info->SetBoolean("isApp", true);
     app_info->SetString("id", app_data.app_id);
+    app_info->SetBoolean("isAndroidApp", false);
+    // Unused for native apps. Added for consistency with Android apps.
+    app_info->SetString("account_email", app_data.account_id.GetUserEmail());
     app_info->SetString("label", app_data.name);
 
     std::string icon_url;
     if (app_data.icon.isNull()) {
       icon_url =
           webui::GetBitmapDataUrl(*ResourceBundle::GetSharedInstance()
                                        .GetImageNamed(IDR_APP_DEFAULT_ICON)
                                        .ToSkBitmap());
     } else {
       icon_url = webui::GetBitmapDataUrl(*app_data.icon.bitmap());
     }
     app_info->SetString("iconUrl", icon_url);
 
     apps_list.Append(std::move(app_info));
   }
 
+  const auto& arc_apps = ArcKioskAppManager::Get()->GetAllApps();
+  for (size_t i = 0; i < arc_apps.size(); ++i) {
+    std::unique_ptr<base::DictionaryValue> app_info(new base::DictionaryValue);

[Luis Héctor Chávez, 2016/11/12 18:03:08]

Try to avoid parenthesesless constructors:
https://sites.google.com/a/chromium.org/dev/developers/coding-style/cpp-dos-a...

[Sergey Poromov, 2016/11/14 17:23:23]

Done.

+    app_info->SetBoolean("isApp", true);
+    app_info->SetBoolean("isAndroidApp", true);
+    app_info->SetString("id", arc_apps[i].app_info().package_name());
+    app_info->SetString("account_email",
+                        arc_apps[i].account_id().GetUserEmail());
+    app_info->SetString("label", arc_apps[i].name());
+
+    std::string icon_url =
+        webui::GetBitmapDataUrl(*ResourceBundle::GetSharedInstance()
+                                     .GetImageNamed(IDR_APP_DEFAULT_ICON)
+                                     .ToSkBitmap());
+    app_info->SetString("iconUrl", icon_url);
+
+    apps_list.Append(std::move(app_info));
+  }
+
   web_ui()->CallJavascriptFunctionUnsafe(
       EnableNewKioskUI() ? kKioskSetAppsNewAPI : kKioskSetAppsOldAPI,
       apps_list);
 }
 
 void KioskAppMenuHandler::HandleInitializeKioskApps(
     const base::ListValue* args) {
   is_webui_initialized_ = true;
   SendKioskApps();
   UpdateState(NetworkError::ERROR_REASON_UPDATE);
@@ skipping 31 matching lines @@
 
 void KioskAppMenuHandler::OnKioskAppDataLoadFailure(const std::string& app_id) {
   SendKioskApps();
 }
 
 void KioskAppMenuHandler::UpdateState(NetworkError::ErrorReason reason) {
   if (network_state_informer_->state() == NetworkStateInformer::ONLINE)
     KioskAppManager::Get()->RetryFailedAppDataFetch();
 }
 
+void KioskAppMenuHandler::OnArcKioskAppsChanged() {
+  SendKioskApps();
+}
+
 }  // namespace chromeos