| Index: chrome/browser/chromeos/app_mode/kiosk_app_data.cc
|
| diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_data.cc b/chrome/browser/chromeos/app_mode/kiosk_app_data.cc
|
| index 31cf27f3c7112d99c87e0eca676eee90070847b9..3b82fd2154b62427f08f8323c0ed19a1d5cc6d45 100644
|
| --- a/chrome/browser/chromeos/app_mode/kiosk_app_data.cc
|
| +++ b/chrome/browser/chromeos/app_mode/kiosk_app_data.cc
|
| @@ -163,13 +163,13 @@ class KioskAppData::IconLoader : public ImageDecoder::Delegate {
|
|
|
| // ImageDecoder::Delegate overrides:
|
| virtual void OnImageDecoded(const ImageDecoder* decoder,
|
| - const SkBitmap& decoded_image) OVERRIDE {
|
| + const SkBitmap& decoded_image) override {
|
| icon_ = gfx::ImageSkia::CreateFrom1xBitmap(decoded_image);
|
| icon_.MakeThreadSafe();
|
| ReportResultOnBlockingPool(SUCCESS);
|
| }
|
|
|
| - virtual void OnDecodeImageFailed(const ImageDecoder* decoder) OVERRIDE {
|
| + virtual void OnDecodeImageFailed(const ImageDecoder* decoder) override {
|
| ReportResultOnBlockingPool(FAILED_TO_DECODE);
|
| }
|
|
|
| @@ -225,7 +225,7 @@ class KioskAppData::WebstoreDataParser
|
| virtual void OnWebstoreParseSuccess(
|
| const std::string& id,
|
| const SkBitmap& icon,
|
| - base::DictionaryValue* parsed_manifest) OVERRIDE {
|
| + base::DictionaryValue* parsed_manifest) override {
|
| // Takes ownership of |parsed_manifest|.
|
| extensions::Manifest manifest(
|
| extensions::Manifest::INVALID_LOCATION,
|
| @@ -243,7 +243,7 @@ class KioskAppData::WebstoreDataParser
|
| virtual void OnWebstoreParseFailure(
|
| const std::string& id,
|
| InstallHelperResultCode result_code,
|
| - const std::string& error_message) OVERRIDE {
|
| + const std::string& error_message) override {
|
| ReportFailure();
|
| }
|
|
|
|
|