Index: chrome/browser/media_galleries/media_galleries_permission_controller.h |
diff --git a/chrome/browser/media_galleries/media_galleries_permission_controller.h b/chrome/browser/media_galleries/media_galleries_permission_controller.h |
index 46bedbf7531b5d9b75bba14e3c69e189fc4e48c8..f23205e3ff22eb5e95042a892df77fcfc2a85944 100644 |
--- a/chrome/browser/media_galleries/media_galleries_permission_controller.h |
+++ b/chrome/browser/media_galleries/media_galleries_permission_controller.h |
@@ -55,23 +55,22 @@ class MediaGalleriesPermissionController |
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; |
+ 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; |
// Auxiliary button for this dialog is the 'Add Folder' button. |
- virtual base::string16 GetAuxiliaryButtonText() const override; |
- virtual void DidClickAuxiliaryButton() override; |
- virtual void DidToggleEntry(GalleryDialogId gallery_id, |
- bool selected) override; |
- virtual void DidClickOpenFolderViewer(GalleryDialogId gallery_id) override; |
- virtual void DidForgetEntry(GalleryDialogId gallery_id) override; |
- virtual base::string16 GetAcceptButtonText() const override; |
- virtual void DialogFinished(bool accepted) override; |
- virtual ui::MenuModel* GetContextMenu(GalleryDialogId gallery_id) override; |
- virtual content::WebContents* WebContents() override; |
+ base::string16 GetAuxiliaryButtonText() const override; |
+ void DidClickAuxiliaryButton() override; |
+ void DidToggleEntry(GalleryDialogId gallery_id, bool selected) override; |
+ void DidClickOpenFolderViewer(GalleryDialogId gallery_id) override; |
+ void DidForgetEntry(GalleryDialogId gallery_id) override; |
+ base::string16 GetAcceptButtonText() const override; |
+ void DialogFinished(bool accepted) override; |
+ ui::MenuModel* GetContextMenu(GalleryDialogId gallery_id) override; |
+ content::WebContents* WebContents() override; |
protected: |
friend class MediaGalleriesPermissionControllerTest; |
@@ -86,7 +85,7 @@ class MediaGalleriesPermissionController |
const CreateDialogCallback& create_dialog_callback, |
const base::Closure& on_finish); |
- virtual ~MediaGalleriesPermissionController(); |
+ ~MediaGalleriesPermissionController() override; |
private: |
// This type keeps track of media galleries already known to the prefs system. |
@@ -112,31 +111,31 @@ class MediaGalleriesPermissionController |
void OnPreferencesInitialized(); |
// SelectFileDialog::Listener implementation: |
- virtual void FileSelected(const base::FilePath& path, |
- int index, |
- void* params) override; |
+ void FileSelected(const base::FilePath& path, |
+ int index, |
+ void* params) override; |
// 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; |
// Populates |known_galleries_| from |preferences_|. Subsequent calls merge |
// into |known_galleries_| and do not change permissions for user toggled |