| Index: chrome/browser/media_galleries/media_galleries_scan_result_controller.h
|
| diff --git a/chrome/browser/media_galleries/media_galleries_scan_result_controller.h b/chrome/browser/media_galleries/media_galleries_scan_result_controller.h
|
| index 41afc217c97d4272ab5a9b107698ad62fade3729..b918dddda8dc0d43b75de976143fcb4e13872003 100644
|
| --- a/chrome/browser/media_galleries/media_galleries_scan_result_controller.h
|
| +++ b/chrome/browser/media_galleries/media_galleries_scan_result_controller.h
|
| @@ -52,21 +52,21 @@ class MediaGalleriesScanResultController
|
| const base::Closure& on_finish);
|
|
|
| // MediaGalleriesDialogController implementation.
|
| - virtual base::string16 GetHeader() const override;
|
| - virtual base::string16 GetSubtext() const override;
|
| - virtual bool IsAcceptAllowed() const override;
|
| - virtual bool ShouldShowFolderViewer(const Entry& entry) const override;
|
| - virtual std::vector<base::string16> GetSectionHeaders() const override;
|
| - virtual Entries GetSectionEntries(size_t index) const override;
|
| - virtual base::string16 GetAuxiliaryButtonText() const override;
|
| - virtual void DidClickAuxiliaryButton() override;
|
| - virtual void DidToggleEntry(MediaGalleryPrefId id, bool selected) override;
|
| - virtual void DidClickOpenFolderViewer(MediaGalleryPrefId id) override;
|
| - virtual void DidForgetEntry(MediaGalleryPrefId id) override;
|
| - virtual base::string16 GetAcceptButtonText() const override;
|
| - virtual void DialogFinished(bool accepted) override;
|
| - virtual ui::MenuModel* GetContextMenu(MediaGalleryPrefId id) override;
|
| - virtual content::WebContents* WebContents() override;
|
| + base::string16 GetHeader() const override;
|
| + base::string16 GetSubtext() const override;
|
| + bool IsAcceptAllowed() const override;
|
| + bool ShouldShowFolderViewer(const Entry& entry) const override;
|
| + std::vector<base::string16> GetSectionHeaders() const override;
|
| + Entries GetSectionEntries(size_t index) const override;
|
| + base::string16 GetAuxiliaryButtonText() const override;
|
| + void DidClickAuxiliaryButton() override;
|
| + void DidToggleEntry(MediaGalleryPrefId id, bool selected) override;
|
| + void DidClickOpenFolderViewer(MediaGalleryPrefId id) override;
|
| + void DidForgetEntry(MediaGalleryPrefId id) override;
|
| + base::string16 GetAcceptButtonText() const override;
|
| + void DialogFinished(bool accepted) override;
|
| + ui::MenuModel* GetContextMenu(MediaGalleryPrefId id) override;
|
| + content::WebContents* WebContents() override;
|
|
|
| protected:
|
| typedef base::Callback<MediaGalleriesDialog* (
|
| @@ -88,7 +88,7 @@ class MediaGalleriesScanResultController
|
| const CreateDialogCallback& create_dialog_callback,
|
| const base::Closure& on_finish);
|
|
|
| - virtual ~MediaGalleriesScanResultController();
|
| + ~MediaGalleriesScanResultController() override;
|
|
|
| private:
|
| friend class MediaGalleriesScanResultControllerTest;
|
| @@ -108,25 +108,25 @@ class MediaGalleriesScanResultController
|
|
|
| // RemovableStorageObserver implementation.
|
| // Used to keep dialog in sync with removable device status.
|
| - virtual void OnRemovableStorageAttached(
|
| + void OnRemovableStorageAttached(
|
| const storage_monitor::StorageInfo& info) override;
|
| - virtual void OnRemovableStorageDetached(
|
| + void OnRemovableStorageDetached(
|
| const storage_monitor::StorageInfo& info) override;
|
|
|
| // MediaGalleriesPreferences::GalleryChangeObserver implementations.
|
| // Used to keep the dialog in sync when the preferences change.
|
| - virtual void OnPermissionAdded(MediaGalleriesPreferences* pref,
|
| - const std::string& extension_id,
|
| - MediaGalleryPrefId pref_id) override;
|
| - virtual void OnPermissionRemoved(MediaGalleriesPreferences* pref,
|
| - const std::string& extension_id,
|
| - MediaGalleryPrefId pref_id) override;
|
| - virtual void OnGalleryAdded(MediaGalleriesPreferences* pref,
|
| - MediaGalleryPrefId pref_id) override;
|
| - virtual void OnGalleryRemoved(MediaGalleriesPreferences* pref,
|
| - MediaGalleryPrefId pref_id) override;
|
| - virtual void OnGalleryInfoUpdated(MediaGalleriesPreferences* pref,
|
| - MediaGalleryPrefId pref_id) override;
|
| + void OnPermissionAdded(MediaGalleriesPreferences* pref,
|
| + const std::string& extension_id,
|
| + MediaGalleryPrefId pref_id) override;
|
| + void OnPermissionRemoved(MediaGalleriesPreferences* pref,
|
| + const std::string& extension_id,
|
| + MediaGalleryPrefId pref_id) override;
|
| + void OnGalleryAdded(MediaGalleriesPreferences* pref,
|
| + MediaGalleryPrefId pref_id) override;
|
| + void OnGalleryRemoved(MediaGalleriesPreferences* pref,
|
| + MediaGalleryPrefId pref_id) override;
|
| + void OnGalleryInfoUpdated(MediaGalleriesPreferences* pref,
|
| + MediaGalleryPrefId pref_id) override;
|
|
|
| // The web contents from which the request originated.
|
| content::WebContents* web_contents_;
|
|
|