Browse Source

[chromium-style] override / virtual warnings

Jeremy Apthorp 7 years ago
parent
commit
e6695cf2ec
62 changed files with 106 additions and 106 deletions
  1. 1 1
      atom/app/atom_content_client.h
  2. 1 1
      atom/app/atom_main_delegate.h
  3. 1 1
      atom/browser/api/atom_api_auto_updater.h
  4. 1 1
      atom/browser/api/atom_api_download_item.h
  5. 1 1
      atom/browser/api/atom_api_protocol.h
  6. 1 1
      atom/browser/api/atom_api_session.h
  7. 1 1
      atom/browser/api/atom_api_web_contents.h
  8. 1 1
      atom/browser/api/save_page_handler.h
  9. 1 1
      atom/browser/atom_browser_client.h
  10. 1 1
      atom/browser/atom_browser_main_parts.h
  11. 1 1
      atom/browser/atom_download_manager_delegate.h
  12. 1 1
      atom/browser/atom_speech_recognition_manager_delegate.h
  13. 1 1
      atom/browser/atom_web_ui_controller_factory.h
  14. 1 1
      atom/browser/browser.h
  15. 1 1
      atom/browser/common_web_contents_delegate.h
  16. 2 2
      atom/browser/native_window_mac.h
  17. 1 1
      atom/browser/net/asar/asar_protocol_handler.h
  18. 1 1
      atom/browser/net/asar/url_request_asar_job.h
  19. 1 1
      atom/browser/net/atom_cert_verifier.h
  20. 1 1
      atom/browser/net/atom_url_request_job_factory.h
  21. 1 1
      atom/browser/net/http_protocol_handler.h
  22. 1 1
      atom/browser/render_process_preferences.h
  23. 2 2
      atom/browser/ui/atom_menu_model.h
  24. 1 1
      atom/browser/ui/autofill_popup.h
  25. 1 1
      atom/browser/ui/tray_icon_cocoa.h
  26. 1 1
      atom/common/crash_reporter/crash_reporter_mac.h
  27. 1 1
      atom/common/node_bindings_mac.h
  28. 1 1
      atom/renderer/api/atom_api_spell_check_client.h
  29. 1 1
      atom/renderer/atom_render_view_observer.h
  30. 1 1
      atom/renderer/atom_renderer_client.h
  31. 1 1
      atom/renderer/atom_sandboxed_renderer_client.cc
  32. 1 1
      atom/renderer/atom_sandboxed_renderer_client.h
  33. 1 1
      atom/renderer/renderer_client_base.h
  34. 1 1
      brightray/browser/browser_client.h
  35. 1 1
      brightray/browser/browser_main_parts.h
  36. 1 1
      brightray/browser/devtools_manager_delegate.h
  37. 1 1
      brightray/browser/inspectable_web_contents_impl.h
  38. 1 1
      brightray/browser/inspectable_web_contents_view_mac.h
  39. 1 1
      brightray/browser/linux/libnotify_notification.h
  40. 1 1
      brightray/browser/linux/notification_presenter_linux.h
  41. 1 1
      brightray/browser/mac/cocoa_notification.h
  42. 1 1
      brightray/browser/mac/notification_presenter_mac.h
  43. 1 1
      brightray/browser/media/media_capture_devices_dispatcher.h
  44. 1 1
      brightray/browser/network_delegate.h
  45. 1 1
      brightray/browser/url_request_context_getter.h
  46. 1 1
      brightray/browser/views/inspectable_web_contents_view_views.cc
  47. 1 1
      brightray/browser/views/inspectable_web_contents_view_views.h
  48. 1 1
      brightray/browser/views/views_delegate.h
  49. 1 1
      brightray/browser/web_ui_controller_factory.h
  50. 1 1
      brightray/common/content_client.h
  51. 1 1
      brightray/common/main_delegate.h
  52. 5 5
      chromium_src/chrome/browser/extensions/global_shortcut_listener_mac.h
  53. 5 5
      chromium_src/chrome/browser/printing/print_view_manager_base.h
  54. 1 1
      chromium_src/chrome/browser/printing/print_view_manager_basic.h
  55. 1 1
      chromium_src/chrome/browser/printing/printing_message_filter.h
  56. 1 1
      chromium_src/chrome/browser/renderer_host/pepper/widevine_cdm_message_filter.h
  57. 19 19
      chromium_src/chrome/browser/speech/tts_controller_impl.h
  58. 8 8
      chromium_src/chrome/browser/speech/tts_mac.mm
  59. 1 1
      chromium_src/chrome/browser/speech/tts_message_filter.h
  60. 3 3
      chromium_src/chrome/browser/ui/cocoa/color_chooser_mac.mm
  61. 1 1
      chromium_src/chrome/renderer/printing/print_web_view_helper.h
  62. 8 8
      chromium_src/chrome/renderer/tts_dispatcher.h

+ 1 - 1
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:

+ 1 - 1
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:

+ 1 - 1
atom/browser/api/atom_api_auto_updater.h

@@ -34,7 +34,7 @@ class AutoUpdater : public mate::EventEmitter<AutoUpdater>,
   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;

+ 1 - 1
atom/browser/api/atom_api_download_item.h

@@ -50,7 +50,7 @@ class DownloadItem : public mate::TrackableObject<DownloadItem>,
 
  protected:
   DownloadItem(v8::Isolate* isolate, content::DownloadItem* download_item);
-  ~DownloadItem();
+  ~DownloadItem() override;
 
   // Override content::DownloadItem::Observer methods
   void OnDownloadUpdated(content::DownloadItem* download) override;

+ 1 - 1
atom/browser/api/atom_api_protocol.h

@@ -47,7 +47,7 @@ class Protocol : public mate::TrackableObject<Protocol> {
 
  protected:
   Protocol(v8::Isolate* isolate, AtomBrowserContext* browser_context);
-  ~Protocol();
+  ~Protocol() override;
 
  private:
   // Possible errors.

+ 1 - 1
atom/browser/api/atom_api_session.h

@@ -91,7 +91,7 @@ class Session : public mate::TrackableObject<Session>,
 
  protected:
   Session(v8::Isolate* isolate, AtomBrowserContext* browser_context);
-  ~Session();
+  ~Session() override;
 
   // content::DownloadManager::Observer:
   void OnDownloadCreated(content::DownloadManager* manager,

+ 1 - 1
atom/browser/api/atom_api_web_contents.h

@@ -262,7 +262,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
               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,

+ 1 - 1
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);

+ 1 - 1
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; }

+ 1 - 1
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();
 

+ 1 - 1
atom/browser/atom_download_manager_delegate.h

@@ -22,7 +22,7 @@ class AtomDownloadManagerDelegate : public content::DownloadManagerDelegate {
       base::Callback<void(const base::FilePath&)>;
 
   explicit AtomDownloadManagerDelegate(content::DownloadManager* manager);
-  virtual ~AtomDownloadManagerDelegate();
+  ~AtomDownloadManagerDelegate() override;
 
   void OnDownloadPathGenerated(uint32_t download_id,
                                const content::DownloadTargetCallback& callback,

+ 1 - 1
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;

+ 1 - 1
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,

+ 1 - 1
atom/browser/browser.h

@@ -38,7 +38,7 @@ class LoginHandler;
 class Browser : public WindowListObserver {
  public:
   Browser();
-  ~Browser();
+  ~Browser() override;
 
   static Browser* Get();
 

+ 1 - 1
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|.

+ 2 - 2
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);

+ 1 - 1
atom/browser/net/asar/asar_protocol_handler.h

@@ -18,7 +18,7 @@ class AsarProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler {
  public:
   explicit AsarProtocolHandler(
       const scoped_refptr<base::TaskRunner>& file_task_runner);
-  virtual ~AsarProtocolHandler();
+  ~AsarProtocolHandler() override;
 
   // net::URLRequestJobFactory::ProtocolHandler:
   net::URLRequestJob* MaybeCreateJob(

+ 1 - 1
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<base::TaskRunner> file_task_runner,
                          std::shared_ptr<Archive> archive,

+ 1 - 1
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<void(const VerifyRequestParams& request,
                                          const net::CompletionCallback&)>;

+ 1 - 1
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,

+ 1 - 1
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(

+ 1 - 1
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);

+ 2 - 2
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); }

+ 1 - 1
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,

+ 1 - 1
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;

+ 1 - 1
atom/common/crash_reporter/crash_reporter_mac.h

@@ -45,7 +45,7 @@ class CrashReporterMac : public CrashReporter {
   friend struct base::DefaultSingletonTraits<CrashReporterMac>;
 
   CrashReporterMac();
-  virtual ~CrashReporterMac();
+  ~CrashReporterMac() override;
 
   void SetUploadsEnabled(bool enable_uploads);
   void SetCrashKeyValue(const base::StringPiece& key,

+ 1 - 1
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;
 

+ 1 - 1
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<v8::Object> provider);
-  virtual ~SpellCheckClient();
+  ~SpellCheckClient() override;
 
  private:
   class SpellcheckRequest;

+ 1 - 1
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.

+ 1 - 1
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<v8::Context> context,

+ 1 - 1
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;
 

+ 1 - 1
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<v8::Context> context,
                          const std::string& callback_name,

+ 1 - 1
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<v8::Context> context,
                                       content::RenderFrame* render_frame) = 0;

+ 1 - 1
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_; }
 

+ 1 - 1
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(); }
 

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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();
 

+ 1 - 1
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(

+ 1 - 1
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;

+ 1 - 1
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(

+ 1 - 1
brightray/browser/media/media_capture_devices_dispatcher.h

@@ -70,7 +70,7 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver {
   friend struct base::DefaultSingletonTraits<MediaCaptureDevicesDispatcher>;
 
   MediaCaptureDevicesDispatcher();
-  virtual ~MediaCaptureDevicesDispatcher();
+  ~MediaCaptureDevicesDispatcher() override;
 
   // Flag used by unittests to disable device enumeration.
   bool is_device_enumeration_disabled_;

+ 1 - 1
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,

+ 1 - 1
brightray/browser/url_request_context_getter.h

@@ -73,7 +73,7 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
       scoped_refptr<base::SingleThreadTaskRunner> 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,

+ 1 - 1
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; }

+ 1 - 1
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;

+ 1 - 1
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:

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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

+ 5 - 5
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.

+ 5 - 5
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);

+ 1 - 1
chromium_src/chrome/browser/printing/print_view_manager_basic.h

@@ -19,7 +19,7 @@ class PrintViewManagerBasic
     : public PrintViewManagerBase,
       public content::WebContentsUserData<PrintViewManagerBasic> {
  public:
-  virtual ~PrintViewManagerBasic();
+  ~PrintViewManagerBasic() override;
 
 #if defined(OS_ANDROID)
   // Sets the file descriptor into which the PDF will be written.

+ 1 - 1
chromium_src/chrome/browser/printing/printing_message_filter.h

@@ -41,7 +41,7 @@ class PrintingMessageFilter : public content::BrowserMessageFilter {
   friend class base::DeleteHelper<PrintingMessageFilter>;
   friend class content::BrowserThread;
 
-  virtual ~PrintingMessageFilter();
+  ~PrintingMessageFilter() override;
 
   void OnDestruct() const override;
 

+ 1 - 1
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<WidevineCdmMessageFilter>;
 
-  virtual ~WidevineCdmMessageFilter();
+  ~WidevineCdmMessageFilter() override;
 
 #if BUILDFLAG(ENABLE_LIBRARY_CDMS)
   // Returns whether any internal plugin supporting |mime_type| is registered

+ 19 - 19
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<VoiceData>* 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<VoiceData>* 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).

+ 8 - 8
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<VoiceData>* out_voices) override;
+  void GetVoices(std::vector<VoiceData>* 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<SingleUseSpeechSynthesizer> speech_synthesizer_;
   base::scoped_nsobject<ChromeTtsDelegate> delegate_;

+ 1 - 1
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<TtsMessageFilter>;
 
-  virtual ~TtsMessageFilter();
+  ~TtsMessageFilter() override;
 
   void OnInitializeVoiceList();
   void OnSpeak(const TtsUtteranceRequest& utterance);

+ 3 - 3
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_;

+ 1 - 1
chromium_src/chrome/renderer/printing/print_web_view_helper.h

@@ -67,7 +67,7 @@ class PrintWebViewHelper
       public content::RenderFrameObserverTracker<PrintWebViewHelper> {
  public:
   explicit PrintWebViewHelper(content::RenderFrame* render_frame);
-  virtual ~PrintWebViewHelper();
+  ~PrintWebViewHelper() override;
 
   void PrintNode(const blink::WebNode& node);
 

+ 8 - 8
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);