| Index: chrome/browser/chromeos/app_mode/kiosk_app_manager.h
|
| diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager.h b/chrome/browser/chromeos/app_mode/kiosk_app_manager.h
|
| index 40791a92fe3f3e1ba6d591fba10e2e7595141b8e..401dfeb72725e167cd52f13178f1cc5d54352a48 100644
|
| --- a/chrome/browser/chromeos/app_mode/kiosk_app_manager.h
|
| +++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager.h
|
| @@ -37,7 +37,8 @@ class KioskAppManager : public content::NotificationObserver,
|
| App();
|
| ~App();
|
|
|
| - std::string id;
|
| + std::string app_id;
|
| + std::string user_id;
|
| std::string name;
|
| gfx::ImageSkia icon;
|
| bool is_loading;
|
| @@ -118,7 +119,7 @@ class KioskAppManager : public content::NotificationObserver,
|
| // Gets KioskAppData for the given app id.
|
| const KioskAppData* GetAppData(const std::string& app_id) const;
|
|
|
| - // Update app data |apps_| based on |prefs_|.
|
| + // Update app data |apps_| based on CrosSettings.
|
| void UpdateAppData();
|
|
|
| // content::NotificationObserver overrides:
|
|
|