Translate device-local account IDs to user IDs

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/values.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"
@@ skipping 51 matching lines @@
     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->SetString("id", app_data.id);
+    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());
   }
@@ skipping 19 matching lines @@
 void KioskAppMenuHandler::HandleLaunchKioskApps(const base::ListValue* args) {
   std::string app_id;
   CHECK(args->GetString(0, &app_id));
 
   KioskAppManager::App app_data;
   CHECK(KioskAppManager::Get()->GetApp(app_id, &app_data));
 
   ExistingUserController::current_controller()->PrepareKioskAppLaunch();
 
   // KioskAppLauncher deletes itself when done.
-  (new KioskAppLauncher(app_id))->Start();
+  (new KioskAppLauncher(KioskAppManager::Get(), app_id))->Start();
 }
 
 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));
 }
 
 void KioskAppMenuHandler::OnKioskAppsSettingsChanged() {
   SendKioskApps();
 }
 
 void KioskAppMenuHandler::OnKioskAppDataChanged(const std::string& app_id) {
   SendKioskApps();
 }
 
 }  // namespace chromeos