| Index: chrome/browser/chromeos/app_mode/kiosk_app_data.h
|
| diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_data.h b/chrome/browser/chromeos/app_mode/kiosk_app_data.h
|
| index 61bea86059e72477e2cd11ed346f0f192441d00a..477380e27bf400a8b74737610c22e0eabb441177 100644
|
| --- a/chrome/browser/chromeos/app_mode/kiosk_app_data.h
|
| +++ b/chrome/browser/chromeos/app_mode/kiosk_app_data.h
|
| @@ -55,7 +55,7 @@ class KioskAppData : public base::SupportsWeakPtr<KioskAppData>,
|
| // Returns true if web store data fetching is in progress.
|
| bool IsLoading() const;
|
|
|
| - const std::string& id() const { return id_; }
|
| + const std::string& app_id() const { return app_id_; }
|
| const std::string& name() const { return name_; }
|
| const gfx::ImageSkia& icon() const { return icon_; }
|
| const base::RefCountedString* raw_icon() const {
|
| @@ -100,7 +100,7 @@ class KioskAppData : public base::SupportsWeakPtr<KioskAppData>,
|
| KioskAppDataDelegate* delegate_; // not owned.
|
| Status status_;
|
|
|
| - std::string id_;
|
| + std::string app_id_;
|
| std::string name_;
|
| gfx::ImageSkia icon_;
|
| scoped_refptr<base::RefCountedString> raw_icon_;
|
|
|