Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(407)

Unified Diff: chrome/browser/media_galleries/media_galleries_permission_controller.h

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 a1163a6464075fb77416dbfac313ff6a2022de29..46bedbf7531b5d9b75bba14e3c69e189fc4e48c8 100644
--- a/chrome/browser/media_galleries/media_galleries_permission_controller.h
+++ b/chrome/browser/media_galleries/media_galleries_permission_controller.h
@@ -55,23 +55,23 @@ 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;
+ 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;
// Auxiliary button for this dialog is the 'Add Folder' button.
- virtual base::string16 GetAuxiliaryButtonText() const OVERRIDE;
- virtual void DidClickAuxiliaryButton() OVERRIDE;
+ 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;
+ 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;
protected:
friend class MediaGalleriesPermissionControllerTest;
@@ -114,29 +114,29 @@ class MediaGalleriesPermissionController
// SelectFileDialog::Listener implementation:
virtual void FileSelected(const base::FilePath& path,
int index,
- void* params) OVERRIDE;
+ void* params) override;
// RemovableStorageObserver implementation.
// Used to keep dialog in sync with removable device status.
virtual void OnRemovableStorageAttached(
- const storage_monitor::StorageInfo& info) OVERRIDE;
+ const storage_monitor::StorageInfo& info) override;
virtual void OnRemovableStorageDetached(
- const storage_monitor::StorageInfo& info) OVERRIDE;
+ 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;
+ MediaGalleryPrefId pref_id) override;
virtual void OnPermissionRemoved(MediaGalleriesPreferences* pref,
const std::string& extension_id,
- MediaGalleryPrefId pref_id) OVERRIDE;
+ MediaGalleryPrefId pref_id) override;
virtual void OnGalleryAdded(MediaGalleriesPreferences* pref,
- MediaGalleryPrefId pref_id) OVERRIDE;
+ MediaGalleryPrefId pref_id) override;
virtual void OnGalleryRemoved(MediaGalleriesPreferences* pref,
- MediaGalleryPrefId pref_id) OVERRIDE;
+ MediaGalleryPrefId pref_id) override;
virtual void OnGalleryInfoUpdated(MediaGalleriesPreferences* pref,
- MediaGalleryPrefId pref_id) OVERRIDE;
+ MediaGalleryPrefId pref_id) override;
// Populates |known_galleries_| from |preferences_|. Subsequent calls merge
// into |known_galleries_| and do not change permissions for user toggled

Powered by Google App Engine
This is Rietveld 408576698