Translate device-local account IDs to user IDs

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

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 cfa016b174490d21e7e1681aefa3e76d76310058..83138862e6ed0d61e5d31240e79ea5bb177f4a75 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
@@ -69,7 +69,7 @@ void KioskAppMenuHandler::SendKioskApps() {
     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.
@@ -109,7 +109,7 @@ void KioskAppMenuHandler::HandleLaunchKioskApps(const base::ListValue* args) {
   ExistingUserController::current_controller()->PrepareKioskAppLaunch();
 
   // KioskAppLauncher deletes itself when done.
-  (new KioskAppLauncher(app_id))->Start();
+  (new KioskAppLauncher(KioskAppManager::Get(), app_id))->Start();
 }
 
 void KioskAppMenuHandler::HandleCheckKioskAppLaunchError(