| Index: chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.h
|
| diff --git a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.h b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.h
|
| index dd61a8720b29ab35e05d0ce12e7356b319f36a85..57d842354a55f6e6c805f8932a53c43746cae156 100644
|
| --- a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.h
|
| +++ b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.h
|
| @@ -39,13 +39,13 @@ class ChangePictureOptionsHandler : public ::options::OptionsPageUIHandler,
|
|
|
| // OptionsPageUIHandler implementation.
|
| virtual void GetLocalizedValues(
|
| - base::DictionaryValue* localized_strings) OVERRIDE;
|
| + base::DictionaryValue* localized_strings) override;
|
|
|
| // WebUIMessageHandler implementation.
|
| - virtual void RegisterMessages() OVERRIDE;
|
| + virtual void RegisterMessages() override;
|
|
|
| // CameraPresenceNotifier::Observer implementation:
|
| - virtual void OnCameraPresenceCheckDone(bool is_camera_present) OVERRIDE;
|
| + virtual void OnCameraPresenceCheckDone(bool is_camera_present) override;
|
|
|
| private:
|
| // Sends list of available default images to the page.
|
| @@ -101,12 +101,12 @@ class ChangePictureOptionsHandler : public ::options::OptionsPageUIHandler,
|
| // SelectFileDialog::Delegate implementation.
|
| virtual void FileSelected(
|
| const base::FilePath& path,
|
| - int index, void* params) OVERRIDE;
|
| + int index, void* params) override;
|
|
|
| // content::NotificationObserver implementation.
|
| virtual void Observe(int type,
|
| const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) OVERRIDE;
|
| + const content::NotificationDetails& details) override;
|
|
|
| // Sets user image to photo taken from camera.
|
| void SetImageFromCamera(const gfx::ImageSkia& photo);
|
| @@ -116,8 +116,8 @@ class ChangePictureOptionsHandler : public ::options::OptionsPageUIHandler,
|
|
|
| // Overriden from ImageDecoder::Delegate:
|
| virtual void OnImageDecoded(const ImageDecoder* decoder,
|
| - const SkBitmap& decoded_image) OVERRIDE;
|
| - virtual void OnDecodeImageFailed(const ImageDecoder* decoder) OVERRIDE;
|
| + const SkBitmap& decoded_image) override;
|
| + virtual void OnDecodeImageFailed(const ImageDecoder* decoder) override;
|
|
|
| // Returns user related to current WebUI. If this user doesn't exist,
|
| // returns active user.
|
|
|