diff --git a/atom/app/atom_content_client.h b/atom/app/atom_content_client.h index fcd26f84183b..d2ed9b78efd8 100644 --- a/atom/app/atom_content_client.h +++ b/atom/app/atom_content_client.h @@ -16,7 +16,7 @@ namespace atom { class AtomContentClient : public brightray::ContentClient { public: AtomContentClient(); - virtual ~AtomContentClient(); + ~AtomContentClient() override; protected: // content::ContentClient: diff --git a/atom/app/atom_main_delegate.h b/atom/app/atom_main_delegate.h index 03256bc9f935..affdea01eec2 100644 --- a/atom/app/atom_main_delegate.h +++ b/atom/app/atom_main_delegate.h @@ -15,7 +15,7 @@ namespace atom { class AtomMainDelegate : public brightray::MainDelegate { public: AtomMainDelegate(); - ~AtomMainDelegate(); + ~AtomMainDelegate() override; protected: // content::ContentMainDelegate: diff --git a/atom/browser/api/atom_api_auto_updater.h b/atom/browser/api/atom_api_auto_updater.h index 57d217cdfdfd..d8875ae0e384 100644 --- a/atom/browser/api/atom_api_auto_updater.h +++ b/atom/browser/api/atom_api_auto_updater.h @@ -34,7 +34,7 @@ class AutoUpdater : public mate::EventEmitter, void OnError(const std::string& error) override; void OnError(const std::string& message, const int code, - const std::string& domain); + const std::string& domain) override; void OnCheckingForUpdate() override; void OnUpdateAvailable() override; void OnUpdateNotAvailable() override; diff --git a/atom/browser/api/atom_api_download_item.h b/atom/browser/api/atom_api_download_item.h index fbc74b1c818a..43a02805960b 100644 --- a/atom/browser/api/atom_api_download_item.h +++ b/atom/browser/api/atom_api_download_item.h @@ -50,7 +50,7 @@ class DownloadItem : public mate::TrackableObject, protected: DownloadItem(v8::Isolate* isolate, content::DownloadItem* download_item); - ~DownloadItem(); + ~DownloadItem() override; // Override content::DownloadItem::Observer methods void OnDownloadUpdated(content::DownloadItem* download) override; diff --git a/atom/browser/api/atom_api_protocol.h b/atom/browser/api/atom_api_protocol.h index 671b6806c6bb..72a76caf5a6b 100644 --- a/atom/browser/api/atom_api_protocol.h +++ b/atom/browser/api/atom_api_protocol.h @@ -47,7 +47,7 @@ class Protocol : public mate::TrackableObject { protected: Protocol(v8::Isolate* isolate, AtomBrowserContext* browser_context); - ~Protocol(); + ~Protocol() override; private: // Possible errors. diff --git a/atom/browser/api/atom_api_session.h b/atom/browser/api/atom_api_session.h index 1059e9856afb..4e88743c6af4 100644 --- a/atom/browser/api/atom_api_session.h +++ b/atom/browser/api/atom_api_session.h @@ -91,7 +91,7 @@ class Session : public mate::TrackableObject, protected: Session(v8::Isolate* isolate, AtomBrowserContext* browser_context); - ~Session(); + ~Session() override; // content::DownloadManager::Observer: void OnDownloadCreated(content::DownloadManager* manager, diff --git a/atom/browser/api/atom_api_web_contents.h b/atom/browser/api/atom_api_web_contents.h index 2049ae8eea46..0724e3456f4d 100644 --- a/atom/browser/api/atom_api_web_contents.h +++ b/atom/browser/api/atom_api_web_contents.h @@ -262,7 +262,7 @@ class WebContents : public mate::TrackableObject, content::WebContents* web_contents, Type type); WebContents(v8::Isolate* isolate, const mate::Dictionary& options); - ~WebContents(); + ~WebContents() override; void InitWithSessionAndOptions(v8::Isolate* isolate, content::WebContents* web_contents, diff --git a/atom/browser/api/save_page_handler.h b/atom/browser/api/save_page_handler.h index 951a9414e03f..ae34211936cb 100644 --- a/atom/browser/api/save_page_handler.h +++ b/atom/browser/api/save_page_handler.h @@ -32,7 +32,7 @@ class SavePageHandler : public content::DownloadManager::Observer, SavePageHandler(content::WebContents* web_contents, const SavePageCallback& callback); - ~SavePageHandler(); + ~SavePageHandler() override; bool Handle(const base::FilePath& full_path, const content::SavePageType& save_type); diff --git a/atom/browser/atom_browser_client.h b/atom/browser/atom_browser_client.h index b2e7ae611447..abb592cc90ca 100644 --- a/atom/browser/atom_browser_client.h +++ b/atom/browser/atom_browser_client.h @@ -31,7 +31,7 @@ class AtomBrowserClient : public brightray::BrowserClient, public content::RenderProcessHostObserver { public: AtomBrowserClient(); - virtual ~AtomBrowserClient(); + ~AtomBrowserClient() override; using Delegate = content::ContentBrowserClient; void set_delegate(Delegate* delegate) { delegate_ = delegate; } diff --git a/atom/browser/atom_browser_main_parts.h b/atom/browser/atom_browser_main_parts.h index 11b375428065..58f9821c020d 100644 --- a/atom/browser/atom_browser_main_parts.h +++ b/atom/browser/atom_browser_main_parts.h @@ -28,7 +28,7 @@ class BridgeTaskRunner; class AtomBrowserMainParts : public brightray::BrowserMainParts { public: AtomBrowserMainParts(); - virtual ~AtomBrowserMainParts(); + ~AtomBrowserMainParts() override; static AtomBrowserMainParts* Get(); diff --git a/atom/browser/atom_download_manager_delegate.h b/atom/browser/atom_download_manager_delegate.h index 54928b26a3d0..ce0400f2b948 100644 --- a/atom/browser/atom_download_manager_delegate.h +++ b/atom/browser/atom_download_manager_delegate.h @@ -22,7 +22,7 @@ class AtomDownloadManagerDelegate : public content::DownloadManagerDelegate { base::Callback; explicit AtomDownloadManagerDelegate(content::DownloadManager* manager); - virtual ~AtomDownloadManagerDelegate(); + ~AtomDownloadManagerDelegate() override; void OnDownloadPathGenerated(uint32_t download_id, const content::DownloadTargetCallback& callback, diff --git a/atom/browser/atom_speech_recognition_manager_delegate.h b/atom/browser/atom_speech_recognition_manager_delegate.h index 011f5dde6025..10f812a99b8e 100644 --- a/atom/browser/atom_speech_recognition_manager_delegate.h +++ b/atom/browser/atom_speech_recognition_manager_delegate.h @@ -18,7 +18,7 @@ class AtomSpeechRecognitionManagerDelegate public content::SpeechRecognitionEventListener { public: AtomSpeechRecognitionManagerDelegate(); - virtual ~AtomSpeechRecognitionManagerDelegate(); + ~AtomSpeechRecognitionManagerDelegate() override; // content::SpeechRecognitionEventListener: void OnRecognitionStart(int session_id) override; diff --git a/atom/browser/atom_web_ui_controller_factory.h b/atom/browser/atom_web_ui_controller_factory.h index 41819daf8ccc..3149d600ecf6 100644 --- a/atom/browser/atom_web_ui_controller_factory.h +++ b/atom/browser/atom_web_ui_controller_factory.h @@ -16,7 +16,7 @@ class AtomWebUIControllerFactory : public content::WebUIControllerFactory { static AtomWebUIControllerFactory* GetInstance(); AtomWebUIControllerFactory(); - virtual ~AtomWebUIControllerFactory(); + ~AtomWebUIControllerFactory() override; // content::WebUIControllerFactory: content::WebUI::TypeID GetWebUIType(content::BrowserContext* browser_context, diff --git a/atom/browser/browser.h b/atom/browser/browser.h index a6d3baa2b3a9..91c0e82f7c25 100644 --- a/atom/browser/browser.h +++ b/atom/browser/browser.h @@ -38,7 +38,7 @@ class LoginHandler; class Browser : public WindowListObserver { public: Browser(); - ~Browser(); + ~Browser() override; static Browser* Get(); diff --git a/atom/browser/common_web_contents_delegate.h b/atom/browser/common_web_contents_delegate.h index 79030ab85ac1..5c24e606a73b 100644 --- a/atom/browser/common_web_contents_delegate.h +++ b/atom/browser/common_web_contents_delegate.h @@ -33,7 +33,7 @@ class CommonWebContentsDelegate public brightray::InspectableWebContentsViewDelegate { public: CommonWebContentsDelegate(); - virtual ~CommonWebContentsDelegate(); + ~CommonWebContentsDelegate() override; // Creates a InspectableWebContents object and takes onwership of // |web_contents|. diff --git a/atom/browser/native_window_mac.h b/atom/browser/native_window_mac.h index 562e04c844e4..62ddc9784441 100644 --- a/atom/browser/native_window_mac.h +++ b/atom/browser/native_window_mac.h @@ -119,8 +119,8 @@ class NativeWindowMac : public NativeWindow { void RefreshTouchBarItem(const std::string& item_id) override; void SetEscapeTouchBarItem(const mate::PersistentDictionary& item) override; - gfx::Rect ContentBoundsToWindowBounds(const gfx::Rect& bounds) const; - gfx::Rect WindowBoundsToContentBounds(const gfx::Rect& bounds) const; + gfx::Rect ContentBoundsToWindowBounds(const gfx::Rect& bounds) const override; + gfx::Rect WindowBoundsToContentBounds(const gfx::Rect& bounds) const override; // Set the attribute of NSWindow while work around a bug of zoom button. void SetStyleMask(bool on, NSUInteger flag); diff --git a/atom/browser/net/asar/asar_protocol_handler.h b/atom/browser/net/asar/asar_protocol_handler.h index e0cb74d5d1bf..f431b55b7170 100644 --- a/atom/browser/net/asar/asar_protocol_handler.h +++ b/atom/browser/net/asar/asar_protocol_handler.h @@ -18,7 +18,7 @@ class AsarProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler { public: explicit AsarProtocolHandler( const scoped_refptr& file_task_runner); - virtual ~AsarProtocolHandler(); + ~AsarProtocolHandler() override; // net::URLRequestJobFactory::ProtocolHandler: net::URLRequestJob* MaybeCreateJob( diff --git a/atom/browser/net/asar/url_request_asar_job.h b/atom/browser/net/asar/url_request_asar_job.h index d7c974fa488d..5a8c301283f2 100644 --- a/atom/browser/net/asar/url_request_asar_job.h +++ b/atom/browser/net/asar/url_request_asar_job.h @@ -42,7 +42,7 @@ class URLRequestAsarJob : public net::URLRequestJob { const base::FilePath& file_path); protected: - virtual ~URLRequestAsarJob(); + ~URLRequestAsarJob() override; void InitializeAsarJob(const scoped_refptr file_task_runner, std::shared_ptr archive, diff --git a/atom/browser/net/atom_cert_verifier.h b/atom/browser/net/atom_cert_verifier.h index 78a212d0eaa2..e8d9f2745c59 100644 --- a/atom/browser/net/atom_cert_verifier.h +++ b/atom/browser/net/atom_cert_verifier.h @@ -31,7 +31,7 @@ struct VerifyRequestParams { class AtomCertVerifier : public net::CertVerifier { public: explicit AtomCertVerifier(brightray::RequireCTDelegate* ct_delegate); - virtual ~AtomCertVerifier(); + ~AtomCertVerifier() override; using VerifyProc = base::Callback; diff --git a/atom/browser/net/atom_url_request_job_factory.h b/atom/browser/net/atom_url_request_job_factory.h index 97f08fa154f1..c0e26568fdea 100644 --- a/atom/browser/net/atom_url_request_job_factory.h +++ b/atom/browser/net/atom_url_request_job_factory.h @@ -21,7 +21,7 @@ const void* DisableProtocolInterceptFlagKey(); class AtomURLRequestJobFactory : public net::URLRequestJobFactory { public: AtomURLRequestJobFactory(); - virtual ~AtomURLRequestJobFactory(); + ~AtomURLRequestJobFactory() override; // Sets the ProtocolHandler for a scheme. Returns true on success, false on // failure (a ProtocolHandler already exists for |scheme|). On success, diff --git a/atom/browser/net/http_protocol_handler.h b/atom/browser/net/http_protocol_handler.h index 98085374175b..39e1ff2ad29b 100644 --- a/atom/browser/net/http_protocol_handler.h +++ b/atom/browser/net/http_protocol_handler.h @@ -14,7 +14,7 @@ namespace atom { class HttpProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler { public: explicit HttpProtocolHandler(const std::string&); - virtual ~HttpProtocolHandler(); + ~HttpProtocolHandler() override; // net::URLRequestJobFactory::ProtocolHandler: net::URLRequestJob* MaybeCreateJob( diff --git a/atom/browser/render_process_preferences.h b/atom/browser/render_process_preferences.h index 77bf176f492c..c84a30f8450c 100644 --- a/atom/browser/render_process_preferences.h +++ b/atom/browser/render_process_preferences.h @@ -27,7 +27,7 @@ class RenderProcessPreferences : public content::NotificationObserver { // The |predicate| is used to determine whether to set preferences for a // render process. explicit RenderProcessPreferences(const Predicate& predicate); - virtual ~RenderProcessPreferences(); + ~RenderProcessPreferences() override; int AddEntry(const base::DictionaryValue& entry); void RemoveEntry(int id); diff --git a/atom/browser/ui/atom_menu_model.h b/atom/browser/ui/atom_menu_model.h index 90de0ef3be8a..2d450343299b 100644 --- a/atom/browser/ui/atom_menu_model.h +++ b/atom/browser/ui/atom_menu_model.h @@ -16,7 +16,7 @@ class AtomMenuModel : public ui::SimpleMenuModel { public: class Delegate : public ui::SimpleMenuModel::Delegate { public: - virtual ~Delegate() {} + ~Delegate() override {} virtual bool GetAcceleratorForCommandIdWithParams( int command_id, @@ -44,7 +44,7 @@ class AtomMenuModel : public ui::SimpleMenuModel { }; explicit AtomMenuModel(Delegate* delegate); - virtual ~AtomMenuModel(); + ~AtomMenuModel() override; void AddObserver(Observer* obs) { observers_.AddObserver(obs); } void RemoveObserver(Observer* obs) { observers_.RemoveObserver(obs); } diff --git a/atom/browser/ui/autofill_popup.h b/atom/browser/ui/autofill_popup.h index 8dceba590247..d0fbf08068f8 100644 --- a/atom/browser/ui/autofill_popup.h +++ b/atom/browser/ui/autofill_popup.h @@ -21,7 +21,7 @@ class AutofillPopupView; class AutofillPopup : public views::ViewObserver { public: AutofillPopup(); - ~AutofillPopup(); + ~AutofillPopup() override; void CreateView(content::RenderFrameHost* render_frame, bool offscreen, diff --git a/atom/browser/ui/tray_icon_cocoa.h b/atom/browser/ui/tray_icon_cocoa.h index 077657304aa7..6286344349f0 100644 --- a/atom/browser/ui/tray_icon_cocoa.h +++ b/atom/browser/ui/tray_icon_cocoa.h @@ -20,7 +20,7 @@ namespace atom { class TrayIconCocoa : public TrayIcon, public AtomMenuModel::Observer { public: TrayIconCocoa(); - virtual ~TrayIconCocoa(); + ~TrayIconCocoa() override; void SetImage(const gfx::Image& image) override; void SetPressedImage(const gfx::Image& image) override; diff --git a/atom/common/crash_reporter/crash_reporter_mac.h b/atom/common/crash_reporter/crash_reporter_mac.h index bd7eda5d71e2..97c7164bb7ab 100644 --- a/atom/common/crash_reporter/crash_reporter_mac.h +++ b/atom/common/crash_reporter/crash_reporter_mac.h @@ -45,7 +45,7 @@ class CrashReporterMac : public CrashReporter { friend struct base::DefaultSingletonTraits; CrashReporterMac(); - virtual ~CrashReporterMac(); + ~CrashReporterMac() override; void SetUploadsEnabled(bool enable_uploads); void SetCrashKeyValue(const base::StringPiece& key, diff --git a/atom/common/node_bindings_mac.h b/atom/common/node_bindings_mac.h index 6b0082bc2276..a0f93d8755ed 100644 --- a/atom/common/node_bindings_mac.h +++ b/atom/common/node_bindings_mac.h @@ -13,7 +13,7 @@ namespace atom { class NodeBindingsMac : public NodeBindings { public: explicit NodeBindingsMac(BrowserEnvironment browser_env); - virtual ~NodeBindingsMac(); + ~NodeBindingsMac() override; void RunMessageLoop() override; diff --git a/atom/renderer/api/atom_api_spell_check_client.h b/atom/renderer/api/atom_api_spell_check_client.h index 5216b455d0db..6d7876143e88 100644 --- a/atom/renderer/api/atom_api_spell_check_client.h +++ b/atom/renderer/api/atom_api_spell_check_client.h @@ -33,7 +33,7 @@ class SpellCheckClient : public blink::WebSpellCheckPanelHostClient, bool auto_spell_correct_turned_on, v8::Isolate* isolate, v8::Local provider); - virtual ~SpellCheckClient(); + ~SpellCheckClient() override; private: class SpellcheckRequest; diff --git a/atom/renderer/atom_render_view_observer.h b/atom/renderer/atom_render_view_observer.h index ca9fb01288e3..097616e12369 100644 --- a/atom/renderer/atom_render_view_observer.h +++ b/atom/renderer/atom_render_view_observer.h @@ -14,7 +14,7 @@ class AtomRenderViewObserver : public content::RenderViewObserver { explicit AtomRenderViewObserver(content::RenderView* render_view); protected: - virtual ~AtomRenderViewObserver(); + ~AtomRenderViewObserver() override; private: // content::RenderViewObserver implementation. diff --git a/atom/renderer/atom_renderer_client.h b/atom/renderer/atom_renderer_client.h index db2efab4b537..a1442b72eb74 100644 --- a/atom/renderer/atom_renderer_client.h +++ b/atom/renderer/atom_renderer_client.h @@ -23,7 +23,7 @@ class NodeBindings; class AtomRendererClient : public RendererClientBase { public: AtomRendererClient(); - virtual ~AtomRendererClient(); + ~AtomRendererClient() override; // atom::RendererClientBase: void DidCreateScriptContext(v8::Handle context, diff --git a/atom/renderer/atom_sandboxed_renderer_client.cc b/atom/renderer/atom_sandboxed_renderer_client.cc index 75cf6a860026..252121f18272 100644 --- a/atom/renderer/atom_sandboxed_renderer_client.cc +++ b/atom/renderer/atom_sandboxed_renderer_client.cc @@ -107,7 +107,7 @@ class AtomSandboxedRenderFrameObserver : public AtomRenderFrameObserver { protected: void EmitIPCEvent(blink::WebLocalFrame* frame, const base::string16& channel, - const base::ListValue& args) { + const base::ListValue& args) override { if (!frame) return; diff --git a/atom/renderer/atom_sandboxed_renderer_client.h b/atom/renderer/atom_sandboxed_renderer_client.h index c36fbcf62609..1ebf4429794f 100644 --- a/atom/renderer/atom_sandboxed_renderer_client.h +++ b/atom/renderer/atom_sandboxed_renderer_client.h @@ -14,7 +14,7 @@ namespace atom { class AtomSandboxedRendererClient : public RendererClientBase { public: AtomSandboxedRendererClient(); - virtual ~AtomSandboxedRendererClient(); + ~AtomSandboxedRendererClient() override; void InvokeIpcCallback(v8::Handle context, const std::string& callback_name, diff --git a/atom/renderer/renderer_client_base.h b/atom/renderer/renderer_client_base.h index 5c296342cc13..31c2f524740d 100644 --- a/atom/renderer/renderer_client_base.h +++ b/atom/renderer/renderer_client_base.h @@ -18,7 +18,7 @@ class PreferencesManager; class RendererClientBase : public content::ContentRendererClient { public: RendererClientBase(); - virtual ~RendererClientBase(); + ~RendererClientBase() override; virtual void DidCreateScriptContext(v8::Handle context, content::RenderFrame* render_frame) = 0; diff --git a/brightray/browser/browser_client.h b/brightray/browser/browser_client.h index 88b132c42c50..73b0e507cafc 100644 --- a/brightray/browser/browser_client.h +++ b/brightray/browser/browser_client.h @@ -23,7 +23,7 @@ class BrowserClient : public content::ContentBrowserClient { static void SetApplicationLocale(const std::string& locale); BrowserClient(); - ~BrowserClient(); + ~BrowserClient() override; BrowserMainParts* browser_main_parts() { return browser_main_parts_; } diff --git a/brightray/browser/browser_main_parts.h b/brightray/browser/browser_main_parts.h index 673d50228f1d..2a31027431b9 100644 --- a/brightray/browser/browser_main_parts.h +++ b/brightray/browser/browser_main_parts.h @@ -33,7 +33,7 @@ namespace brightray { class BrowserMainParts : public content::BrowserMainParts { public: BrowserMainParts(); - ~BrowserMainParts(); + ~BrowserMainParts() override; IOThread* io_thread() const { return io_thread_.get(); } diff --git a/brightray/browser/devtools_manager_delegate.h b/brightray/browser/devtools_manager_delegate.h index 631111cc6aa1..5d75d2b00186 100644 --- a/brightray/browser/devtools_manager_delegate.h +++ b/brightray/browser/devtools_manager_delegate.h @@ -18,7 +18,7 @@ class DevToolsManagerDelegate : public content::DevToolsManagerDelegate { static void StartHttpHandler(); DevToolsManagerDelegate(); - virtual ~DevToolsManagerDelegate(); + ~DevToolsManagerDelegate() override; // DevToolsManagerDelegate implementation. void Inspect(content::DevToolsAgentHost* agent_host) override; diff --git a/brightray/browser/inspectable_web_contents_impl.h b/brightray/browser/inspectable_web_contents_impl.h index 0cd7d2b45b04..32145f281fb3 100644 --- a/brightray/browser/inspectable_web_contents_impl.h +++ b/brightray/browser/inspectable_web_contents_impl.h @@ -40,7 +40,7 @@ class InspectableWebContentsImpl static void RegisterPrefs(PrefRegistrySimple* pref_registry); explicit InspectableWebContentsImpl(content::WebContents*); - virtual ~InspectableWebContentsImpl(); + ~InspectableWebContentsImpl() override; InspectableWebContentsView* GetView() const override; content::WebContents* GetWebContents() const override; diff --git a/brightray/browser/inspectable_web_contents_view_mac.h b/brightray/browser/inspectable_web_contents_view_mac.h index 990fdf58c939..40a140c7297f 100644 --- a/brightray/browser/inspectable_web_contents_view_mac.h +++ b/brightray/browser/inspectable_web_contents_view_mac.h @@ -15,7 +15,7 @@ class InspectableWebContentsViewMac : public InspectableWebContentsView { public: explicit InspectableWebContentsViewMac( InspectableWebContentsImpl* inspectable_web_contents_impl); - virtual ~InspectableWebContentsViewMac(); + ~InspectableWebContentsViewMac() override; gfx::NativeView GetNativeView() const override; void ShowDevTools() override; diff --git a/brightray/browser/linux/libnotify_notification.h b/brightray/browser/linux/libnotify_notification.h index a33055180b07..db0b9f04a874 100644 --- a/brightray/browser/linux/libnotify_notification.h +++ b/brightray/browser/linux/libnotify_notification.h @@ -18,7 +18,7 @@ class LibnotifyNotification : public Notification { public: LibnotifyNotification(NotificationDelegate* delegate, NotificationPresenter* presenter); - virtual ~LibnotifyNotification(); + ~LibnotifyNotification() override; static bool Initialize(); diff --git a/brightray/browser/linux/notification_presenter_linux.h b/brightray/browser/linux/notification_presenter_linux.h index ed387624219a..1ae4b2d1cc9b 100644 --- a/brightray/browser/linux/notification_presenter_linux.h +++ b/brightray/browser/linux/notification_presenter_linux.h @@ -13,7 +13,7 @@ namespace brightray { class NotificationPresenterLinux : public NotificationPresenter { public: NotificationPresenterLinux(); - ~NotificationPresenterLinux(); + ~NotificationPresenterLinux() override; private: Notification* CreateNotificationObject( diff --git a/brightray/browser/mac/cocoa_notification.h b/brightray/browser/mac/cocoa_notification.h index 1cdd7e33b423..41f6d4b5a423 100644 --- a/brightray/browser/mac/cocoa_notification.h +++ b/brightray/browser/mac/cocoa_notification.h @@ -20,7 +20,7 @@ class CocoaNotification : public Notification { public: CocoaNotification(NotificationDelegate* delegate, NotificationPresenter* presenter); - ~CocoaNotification(); + ~CocoaNotification() override; // Notification: void Show(const NotificationOptions& options) override; diff --git a/brightray/browser/mac/notification_presenter_mac.h b/brightray/browser/mac/notification_presenter_mac.h index 0e0e42048cf9..b23e10b82f0d 100644 --- a/brightray/browser/mac/notification_presenter_mac.h +++ b/brightray/browser/mac/notification_presenter_mac.h @@ -19,7 +19,7 @@ class NotificationPresenterMac : public NotificationPresenter { CocoaNotification* GetNotification(NSUserNotification* notif); NotificationPresenterMac(); - ~NotificationPresenterMac(); + ~NotificationPresenterMac() override; private: Notification* CreateNotificationObject( diff --git a/brightray/browser/media/media_capture_devices_dispatcher.h b/brightray/browser/media/media_capture_devices_dispatcher.h index b0d212e5f6d6..b82a96712f69 100644 --- a/brightray/browser/media/media_capture_devices_dispatcher.h +++ b/brightray/browser/media/media_capture_devices_dispatcher.h @@ -70,7 +70,7 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver { friend struct base::DefaultSingletonTraits; MediaCaptureDevicesDispatcher(); - virtual ~MediaCaptureDevicesDispatcher(); + ~MediaCaptureDevicesDispatcher() override; // Flag used by unittests to disable device enumeration. bool is_device_enumeration_disabled_; diff --git a/brightray/browser/network_delegate.h b/brightray/browser/network_delegate.h index 03e8235129c4..3c12624b27e1 100644 --- a/brightray/browser/network_delegate.h +++ b/brightray/browser/network_delegate.h @@ -15,7 +15,7 @@ namespace brightray { class NetworkDelegate : public net::NetworkDelegate { public: NetworkDelegate(); - virtual ~NetworkDelegate(); + ~NetworkDelegate() override; protected: int OnBeforeURLRequest(net::URLRequest* request, diff --git a/brightray/browser/url_request_context_getter.h b/brightray/browser/url_request_context_getter.h index 049d23548c6e..361e38553026 100644 --- a/brightray/browser/url_request_context_getter.h +++ b/brightray/browser/url_request_context_getter.h @@ -73,7 +73,7 @@ class URLRequestContextGetter : public net::URLRequestContextGetter { scoped_refptr io_task_runner, content::ProtocolHandlerMap* protocol_handlers, content::URLRequestInterceptorScopedVector protocol_interceptors); - virtual ~URLRequestContextGetter(); + ~URLRequestContextGetter() override; // net::CookieStore::CookieChangedCallback implementation. void OnCookieChanged(const net::CanonicalCookie& cookie, diff --git a/brightray/browser/views/inspectable_web_contents_view_views.cc b/brightray/browser/views/inspectable_web_contents_view_views.cc index 4cac31f8c8a4..e95ffd05ee3c 100644 --- a/brightray/browser/views/inspectable_web_contents_view_views.cc +++ b/brightray/browser/views/inspectable_web_contents_view_views.cc @@ -30,7 +30,7 @@ class DevToolsWindowDelegate : public views::ClientView, if (shell->GetDelegate()) icon_ = shell->GetDelegate()->GetDevToolsWindowIcon(); } - virtual ~DevToolsWindowDelegate() {} + ~DevToolsWindowDelegate() override {} // views::WidgetDelegate: void DeleteDelegate() override { delete this; } diff --git a/brightray/browser/views/inspectable_web_contents_view_views.h b/brightray/browser/views/inspectable_web_contents_view_views.h index ebc2b90edf1d..5b1dba91363f 100644 --- a/brightray/browser/views/inspectable_web_contents_view_views.h +++ b/brightray/browser/views/inspectable_web_contents_view_views.h @@ -21,7 +21,7 @@ class InspectableWebContentsViewViews : public InspectableWebContentsView, public: explicit InspectableWebContentsViewViews( InspectableWebContentsImpl* inspectable_web_contents_impl); - ~InspectableWebContentsViewViews(); + ~InspectableWebContentsViewViews() override; // InspectableWebContentsView: views::View* GetView() override; diff --git a/brightray/browser/views/views_delegate.h b/brightray/browser/views/views_delegate.h index a0609cd3db78..cebe55398b0f 100644 --- a/brightray/browser/views/views_delegate.h +++ b/brightray/browser/views/views_delegate.h @@ -15,7 +15,7 @@ namespace brightray { class ViewsDelegate : public views::ViewsDelegate { public: ViewsDelegate(); - virtual ~ViewsDelegate(); + ~ViewsDelegate() override; protected: // views::ViewsDelegate: diff --git a/brightray/browser/web_ui_controller_factory.h b/brightray/browser/web_ui_controller_factory.h index 51e53ef510ee..980acaeaf47d 100644 --- a/brightray/browser/web_ui_controller_factory.h +++ b/brightray/browser/web_ui_controller_factory.h @@ -23,7 +23,7 @@ class WebUIControllerFactory : public content::WebUIControllerFactory { static WebUIControllerFactory* GetInstance(); WebUIControllerFactory(); - virtual ~WebUIControllerFactory(); + ~WebUIControllerFactory() override; content::WebUI::TypeID GetWebUIType(content::BrowserContext* browser_context, const GURL& url) const override; diff --git a/brightray/common/content_client.h b/brightray/common/content_client.h index 44fddd8b45a5..0089ebc9d810 100644 --- a/brightray/common/content_client.h +++ b/brightray/common/content_client.h @@ -17,7 +17,7 @@ std::string GetBrightrayUserAgent(); class ContentClient : public content::ContentClient { public: ContentClient(); - ~ContentClient(); + ~ContentClient() override; private: std::string GetProduct() const override; diff --git a/brightray/common/main_delegate.h b/brightray/common/main_delegate.h index c5a294caab52..3160f9b252cf 100644 --- a/brightray/common/main_delegate.h +++ b/brightray/common/main_delegate.h @@ -30,7 +30,7 @@ void LoadCommonResources(); class MainDelegate : public content::ContentMainDelegate { public: MainDelegate(); - ~MainDelegate(); + ~MainDelegate() override; protected: // Subclasses can override this to provide their own ContentClient diff --git a/chromium_src/chrome/browser/extensions/global_shortcut_listener_mac.h b/chromium_src/chrome/browser/extensions/global_shortcut_listener_mac.h index 7cf8c74bc8b4..c64ff04a87c6 100644 --- a/chromium_src/chrome/browser/extensions/global_shortcut_listener_mac.h +++ b/chromium_src/chrome/browser/extensions/global_shortcut_listener_mac.h @@ -29,7 +29,7 @@ namespace extensions { class GlobalShortcutListenerMac : public GlobalShortcutListener { public: GlobalShortcutListenerMac(); - virtual ~GlobalShortcutListenerMac(); + ~GlobalShortcutListenerMac() override; private: typedef int KeyId; @@ -42,11 +42,11 @@ class GlobalShortcutListenerMac : public GlobalShortcutListener { bool OnMediaOrVolumeKeyEvent(int key_code); // GlobalShortcutListener implementation. - virtual void StartListening() override; - virtual void StopListening() override; - virtual bool RegisterAcceleratorImpl( + void StartListening() override; + void StopListening() override; + bool RegisterAcceleratorImpl( const ui::Accelerator& accelerator) override; - virtual void UnregisterAcceleratorImpl( + void UnregisterAcceleratorImpl( const ui::Accelerator& accelerator) override; // Mac-specific functions for registering hot keys with modifiers. diff --git a/chromium_src/chrome/browser/printing/print_view_manager_base.h b/chromium_src/chrome/browser/printing/print_view_manager_base.h index 669889b0e308..8f20cead1aa3 100644 --- a/chromium_src/chrome/browser/printing/print_view_manager_base.h +++ b/chromium_src/chrome/browser/printing/print_view_manager_base.h @@ -34,7 +34,7 @@ class PrintQueriesQueue; class PrintViewManagerBase : public content::NotificationObserver, public content::WebContentsObserver { public: - virtual ~PrintViewManagerBase(); + ~PrintViewManagerBase() override; #if !defined(DISABLE_BASIC_PRINTING) // Prints the current document immediately. Since the rendering is @@ -70,12 +70,12 @@ class PrintViewManagerBase : public content::NotificationObserver, private: // content::NotificationObserver implementation. - virtual void Observe(int type, - const content::NotificationSource& source, - const content::NotificationDetails& details) override; + void Observe(int type, + const content::NotificationSource& source, + const content::NotificationDetails& details) override; // Cancels the print job. - virtual void NavigationStopped() override; + void NavigationStopped() override; // IPC Message handlers. void OnDidGetPrintedPagesCount(int cookie, int number_pages); diff --git a/chromium_src/chrome/browser/printing/print_view_manager_basic.h b/chromium_src/chrome/browser/printing/print_view_manager_basic.h index 553c555cc3a6..db4c60a16954 100644 --- a/chromium_src/chrome/browser/printing/print_view_manager_basic.h +++ b/chromium_src/chrome/browser/printing/print_view_manager_basic.h @@ -19,7 +19,7 @@ class PrintViewManagerBasic : public PrintViewManagerBase, public content::WebContentsUserData { public: - virtual ~PrintViewManagerBasic(); + ~PrintViewManagerBasic() override; #if defined(OS_ANDROID) // Sets the file descriptor into which the PDF will be written. diff --git a/chromium_src/chrome/browser/printing/printing_message_filter.h b/chromium_src/chrome/browser/printing/printing_message_filter.h index 9a6d3c5ec570..097010478fe0 100644 --- a/chromium_src/chrome/browser/printing/printing_message_filter.h +++ b/chromium_src/chrome/browser/printing/printing_message_filter.h @@ -41,7 +41,7 @@ class PrintingMessageFilter : public content::BrowserMessageFilter { friend class base::DeleteHelper; friend class content::BrowserThread; - virtual ~PrintingMessageFilter(); + ~PrintingMessageFilter() override; void OnDestruct() const override; diff --git a/chromium_src/chrome/browser/renderer_host/pepper/widevine_cdm_message_filter.h b/chromium_src/chrome/browser/renderer_host/pepper/widevine_cdm_message_filter.h index abd38c79a2bf..58e966a0a630 100644 --- a/chromium_src/chrome/browser/renderer_host/pepper/widevine_cdm_message_filter.h +++ b/chromium_src/chrome/browser/renderer_host/pepper/widevine_cdm_message_filter.h @@ -24,7 +24,7 @@ class WidevineCdmMessageFilter : public content::BrowserMessageFilter { friend class content::BrowserThread; friend class base::DeleteHelper; - virtual ~WidevineCdmMessageFilter(); + ~WidevineCdmMessageFilter() override; #if BUILDFLAG(ENABLE_LIBRARY_CDMS) // Returns whether any internal plugin supporting |mime_type| is registered diff --git a/chromium_src/chrome/browser/speech/tts_controller_impl.h b/chromium_src/chrome/browser/speech/tts_controller_impl.h index e11cacbe41b8..556c9febccb1 100644 --- a/chromium_src/chrome/browser/speech/tts_controller_impl.h +++ b/chromium_src/chrome/browser/speech/tts_controller_impl.h @@ -29,30 +29,30 @@ class TtsControllerImpl : public TtsController { static TtsControllerImpl* GetInstance(); // TtsController methods - virtual bool IsSpeaking() override; - virtual void SpeakOrEnqueue(Utterance* utterance) override; - virtual void Stop() override; - virtual void Pause() override; - virtual void Resume() override; - virtual void OnTtsEvent(int utterance_id, - TtsEventType event_type, - int char_index, - const std::string& error_message) override; - virtual void GetVoices(content::BrowserContext* browser_context, - std::vector* out_voices) override; - virtual void VoicesChanged() override; - virtual void AddVoicesChangedDelegate( + bool IsSpeaking() override; + void SpeakOrEnqueue(Utterance* utterance) override; + void Stop() override; + void Pause() override; + void Resume() override; + void OnTtsEvent(int utterance_id, + TtsEventType event_type, + int char_index, + const std::string& error_message) override; + void GetVoices(content::BrowserContext* browser_context, + std::vector* out_voices) override; + void VoicesChanged() override; + void AddVoicesChangedDelegate( VoicesChangedDelegate* delegate) override; - virtual void RemoveVoicesChangedDelegate( + void RemoveVoicesChangedDelegate( VoicesChangedDelegate* delegate) override; - virtual void SetTtsEngineDelegate(TtsEngineDelegate* delegate) override; - virtual TtsEngineDelegate* GetTtsEngineDelegate() override; - virtual void SetPlatformImpl(TtsPlatformImpl* platform_impl) override; - virtual int QueueSize() override; + void SetTtsEngineDelegate(TtsEngineDelegate* delegate) override; + TtsEngineDelegate* GetTtsEngineDelegate() override; + void SetPlatformImpl(TtsPlatformImpl* platform_impl) override; + int QueueSize() override; protected: TtsControllerImpl(); - virtual ~TtsControllerImpl(); + ~TtsControllerImpl() override; private: // Get the platform TTS implementation (or injected mock). diff --git a/chromium_src/chrome/browser/speech/tts_mac.mm b/chromium_src/chrome/browser/speech/tts_mac.mm index aafbd4692515..782c9d08b0ba 100644 --- a/chromium_src/chrome/browser/speech/tts_mac.mm +++ b/chromium_src/chrome/browser/speech/tts_mac.mm @@ -49,26 +49,26 @@ class TtsPlatformImplMac; class TtsPlatformImplMac : public TtsPlatformImpl { public: - virtual bool PlatformImplAvailable() override { + bool PlatformImplAvailable() override { return true; } - virtual bool Speak( + bool Speak( int utterance_id, const std::string& utterance, const std::string& lang, const VoiceData& voice, const UtteranceContinuousParameters& params) override; - virtual bool StopSpeaking() override; + bool StopSpeaking() override; - virtual void Pause() override; + void Pause() override; - virtual void Resume() override; + void Resume() override; - virtual bool IsSpeaking() override; + bool IsSpeaking() override; - virtual void GetVoices(std::vector* out_voices) override; + void GetVoices(std::vector* out_voices) override; // Called by ChromeTtsDelegate when we get a callback from the // native speech engine. @@ -82,7 +82,7 @@ class TtsPlatformImplMac : public TtsPlatformImpl { private: TtsPlatformImplMac(); - virtual ~TtsPlatformImplMac(); + ~TtsPlatformImplMac() override; base::scoped_nsobject speech_synthesizer_; base::scoped_nsobject delegate_; diff --git a/chromium_src/chrome/browser/speech/tts_message_filter.h b/chromium_src/chrome/browser/speech/tts_message_filter.h index 31e009b3fcc3..cb089d5c7d4a 100644 --- a/chromium_src/chrome/browser/speech/tts_message_filter.h +++ b/chromium_src/chrome/browser/speech/tts_message_filter.h @@ -41,7 +41,7 @@ class TtsMessageFilter : public content::BrowserMessageFilter, friend class content::BrowserThread; friend class base::DeleteHelper; - virtual ~TtsMessageFilter(); + ~TtsMessageFilter() override; void OnInitializeVoiceList(); void OnSpeak(const TtsUtteranceRequest& utterance); diff --git a/chromium_src/chrome/browser/ui/cocoa/color_chooser_mac.mm b/chromium_src/chrome/browser/ui/cocoa/color_chooser_mac.mm index 6183dd5d5bd0..c5aa67d62141 100644 --- a/chromium_src/chrome/browser/ui/cocoa/color_chooser_mac.mm +++ b/chromium_src/chrome/browser/ui/cocoa/color_chooser_mac.mm @@ -39,14 +39,14 @@ class ColorChooserMac : public content::ColorChooser { SkColor initial_color); ColorChooserMac(content::WebContents* tab, SkColor initial_color); - virtual ~ColorChooserMac(); + ~ColorChooserMac() override; // Called from ColorPanelCocoa. void DidChooseColorInColorPanel(SkColor color); void DidCloseColorPabel(); - virtual void End() override; - virtual void SetSelectedColor(SkColor color) override; + void End() override; + void SetSelectedColor(SkColor color) override; private: static ColorChooserMac* current_color_chooser_; diff --git a/chromium_src/chrome/renderer/printing/print_web_view_helper.h b/chromium_src/chrome/renderer/printing/print_web_view_helper.h index 94e16eaabf45..7655ef4efe5c 100644 --- a/chromium_src/chrome/renderer/printing/print_web_view_helper.h +++ b/chromium_src/chrome/renderer/printing/print_web_view_helper.h @@ -67,7 +67,7 @@ class PrintWebViewHelper public content::RenderFrameObserverTracker { public: explicit PrintWebViewHelper(content::RenderFrame* render_frame); - virtual ~PrintWebViewHelper(); + ~PrintWebViewHelper() override; void PrintNode(const blink::WebNode& node); diff --git a/chromium_src/chrome/renderer/tts_dispatcher.h b/chromium_src/chrome/renderer/tts_dispatcher.h index 2e5e6062fd1e..57928a3d2316 100644 --- a/chromium_src/chrome/renderer/tts_dispatcher.h +++ b/chromium_src/chrome/renderer/tts_dispatcher.h @@ -29,19 +29,19 @@ class TtsDispatcher : public blink::WebSpeechSynthesizer, public content::RenderThreadObserver { public: explicit TtsDispatcher(blink::WebSpeechSynthesizerClient* client); - virtual ~TtsDispatcher(); + ~TtsDispatcher() override; private: // RenderProcessObserver override. - virtual bool OnControlMessageReceived(const IPC::Message& message) override; + bool OnControlMessageReceived(const IPC::Message& message) override; // blink::WebSpeechSynthesizer implementation. - virtual void UpdateVoiceList() override; - virtual void Speak( - const blink::WebSpeechSynthesisUtterance& utterance) override; - virtual void Pause() override; - virtual void Resume() override; - virtual void Cancel() override; + void UpdateVoiceList() override; + void Speak(const blink::WebSpeechSynthesisUtterance& utterance) + override; + void Pause() override; + void Resume() override; + void Cancel() override; blink::WebSpeechSynthesisUtterance FindUtterance(int utterance_id);