Translate device-local account IDs to user IDs

chrome/browser/ui/webui/options/chromeos/kiosk_apps_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/options/chromeos/kiosk_apps_handler.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 21 matching lines @@
 
 // Populates app info dictionary with |app_data|.
 void PopulateAppDict(const KioskAppManager::App& app_data,
                      base::DictionaryValue* app_dict) {
   std::string icon_url("chrome://theme/IDR_APP_DEFAULT_ICON");
 
   // TODO(xiyuan): Replace data url with a URLDataSource.
   if (!app_data.icon.isNull())
     icon_url = webui::GetBitmapDataUrl(*app_data.icon.bitmap());
 
-  app_dict->SetString("id", app_data.id);
+  app_dict->SetString("id", app_data.app_id);
   app_dict->SetString("name", app_data.name);
   app_dict->SetString("iconURL", icon_url);
   app_dict->SetBoolean(
       "autoLaunch",
-      KioskAppManager::Get()->GetAutoLaunchApp() == app_data.id);
+      KioskAppManager::Get()->GetAutoLaunchApp() == app_data.app_id);
   app_dict->SetBoolean("isLoading", app_data.is_loading);
 }
 
 // Sanitize app id input value and extracts app id out of it.
 // Returns false if an app id could not be derived out of the input.
 bool ExtractsAppIdFromInput(const std::string& input,
                             std::string* app_id) {
   if (extensions::Extension::IdIsValid(input)) {
     *app_id = input;
     return true;
@@ skipping 183 matching lines @@
 
   std::string startup_app_id = kiosk_app_manager_->GetAutoLaunchApp();
   if (startup_app_id != app_id)
     return;
 
   kiosk_app_manager_->SetAutoLaunchApp("");
 }
 
 }  // namespace options
 }  // namespace chromeos