From 43421aedcfe8888d53c1191116be392c69cbb9ff Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Fri, 9 Jan 2015 17:24:36 -0800 Subject: [PATCH] OVERRIDE macro is now removed --- atom/app/atom_content_client.h | 6 ++--- atom/browser/api/atom_api_auto_updater.h | 16 +++++++------- atom/browser/api/atom_api_global_shortcut.h | 6 ++--- atom/browser/api/atom_api_menu_mac.h | 4 ++-- atom/browser/api/atom_api_menu_views.h | 4 ++-- atom/browser/api/atom_api_power_monitor.h | 6 ++--- atom/browser/api/atom_api_protocol.cc | 6 ++--- atom/browser/api/event.h | 4 ++-- atom/browser/atom_access_token_store.h | 8 +++---- atom/browser/atom_browser_main_parts.h | 10 ++++----- atom/browser/atom_javascript_dialog_manager.h | 15 ++++++------- atom/browser/native_window_views.cc | 2 +- atom/browser/net/adapter_request_job.h | 20 ++++++++--------- atom/browser/net/asar/asar_protocol_handler.h | 6 ++--- atom/browser/net/asar/url_request_asar_job.h | 12 +++++----- .../net/atom_url_request_job_factory.h | 10 ++++----- atom/browser/net/url_request_string_job.h | 8 +++---- atom/browser/node_debugger.h | 12 +++++----- atom/browser/ui/tray_icon_cocoa.h | 12 +++++----- atom/browser/ui/tray_icon_gtk.h | 10 ++++----- .../crash_reporter/crash_reporter_linux.h | 14 ++++++------ .../crash_reporter/crash_reporter_mac.h | 14 ++++++------ .../crash_reporter/crash_reporter_win.h | 14 ++++++------ atom/renderer/atom_render_view_observer.h | 6 ++--- .../printing/printing_message_filter.h | 6 ++--- .../browser/speech/tts_message_filter.h | 22 +++++++++---------- 26 files changed, 126 insertions(+), 127 deletions(-) diff --git a/atom/app/atom_content_client.h b/atom/app/atom_content_client.h index 890d868ff053..732ac3587800 100644 --- a/atom/app/atom_content_client.h +++ b/atom/app/atom_content_client.h @@ -19,10 +19,10 @@ class AtomContentClient : public brightray::ContentClient { protected: // content::ContentClient: - virtual std::string GetProduct() const OVERRIDE; - virtual void AddAdditionalSchemes( + std::string GetProduct() const override; + void AddAdditionalSchemes( std::vector* standard_schemes, - std::vector* savable_schemes) OVERRIDE; + std::vector* savable_schemes) override; private: DISALLOW_COPY_AND_ASSIGN(AtomContentClient); diff --git a/atom/browser/api/atom_api_auto_updater.h b/atom/browser/api/atom_api_auto_updater.h index cf78f220e70d..50c3989703a1 100644 --- a/atom/browser/api/atom_api_auto_updater.h +++ b/atom/browser/api/atom_api_auto_updater.h @@ -26,20 +26,20 @@ class AutoUpdater : public mate::EventEmitter, virtual ~AutoUpdater(); // AutoUpdaterDelegate implementations. - virtual void OnError(const std::string& error) OVERRIDE; - virtual void OnCheckingForUpdate() OVERRIDE; - virtual void OnUpdateAvailable() OVERRIDE; - virtual void OnUpdateNotAvailable() OVERRIDE; - virtual void OnUpdateDownloaded( + void OnError(const std::string& error) override; + void OnCheckingForUpdate() override; + void OnUpdateAvailable() override; + void OnUpdateNotAvailable() override; + void OnUpdateDownloaded( const std::string& release_notes, const std::string& release_name, const base::Time& release_date, const std::string& update_url, - const base::Closure& quit_and_install) OVERRIDE; + const base::Closure& quit_and_install) override; // mate::Wrappable implementations: - virtual mate::ObjectTemplateBuilder GetObjectTemplateBuilder( - v8::Isolate* isolate); + mate::ObjectTemplateBuilder GetObjectTemplateBuilder( + v8::Isolate* isolate) override; private: void QuitAndInstall(); diff --git a/atom/browser/api/atom_api_global_shortcut.h b/atom/browser/api/atom_api_global_shortcut.h index 2f010ed7fbf2..15cd3d4e0edb 100644 --- a/atom/browser/api/atom_api_global_shortcut.h +++ b/atom/browser/api/atom_api_global_shortcut.h @@ -28,8 +28,8 @@ class GlobalShortcut : public extensions::GlobalShortcutListener::Observer, virtual ~GlobalShortcut(); // mate::Wrappable implementations: - virtual mate::ObjectTemplateBuilder GetObjectTemplateBuilder( - v8::Isolate* isolate) OVERRIDE; + mate::ObjectTemplateBuilder GetObjectTemplateBuilder( + v8::Isolate* isolate) override; private: typedef std::map AcceleratorCallbackMap; @@ -41,7 +41,7 @@ class GlobalShortcut : public extensions::GlobalShortcutListener::Observer, void UnregisterAll(); // GlobalShortcutListener::Observer implementation. - virtual void OnKeyPressed(const ui::Accelerator& accelerator) OVERRIDE; + void OnKeyPressed(const ui::Accelerator& accelerator) override; AcceleratorCallbackMap accelerator_callback_map_; diff --git a/atom/browser/api/atom_api_menu_mac.h b/atom/browser/api/atom_api_menu_mac.h index f055d92cde3d..5a086776a639 100644 --- a/atom/browser/api/atom_api_menu_mac.h +++ b/atom/browser/api/atom_api_menu_mac.h @@ -19,8 +19,8 @@ class MenuMac : public Menu { protected: MenuMac(); - virtual void Popup(Window* window) OVERRIDE; - virtual void PopupAt(Window* window, int x, int y) OVERRIDE; + void Popup(Window* window) override; + void PopupAt(Window* window, int x, int y) override; base::scoped_nsobject menu_controller_; diff --git a/atom/browser/api/atom_api_menu_views.h b/atom/browser/api/atom_api_menu_views.h index 47df508ff988..de0d2e8b0144 100644 --- a/atom/browser/api/atom_api_menu_views.h +++ b/atom/browser/api/atom_api_menu_views.h @@ -17,8 +17,8 @@ class MenuViews : public Menu { MenuViews(); protected: - virtual void Popup(Window* window) OVERRIDE; - virtual void PopupAt(Window* window, int x, int y) OVERRIDE; + void Popup(Window* window) override; + void PopupAt(Window* window, int x, int y) override; private: void PopupAtPoint(Window* window, const gfx::Point& point); diff --git a/atom/browser/api/atom_api_power_monitor.h b/atom/browser/api/atom_api_power_monitor.h index 9abb17d01457..2fccc7fd311b 100644 --- a/atom/browser/api/atom_api_power_monitor.h +++ b/atom/browser/api/atom_api_power_monitor.h @@ -24,9 +24,9 @@ class PowerMonitor : public mate::EventEmitter, virtual ~PowerMonitor(); // base::PowerObserver implementations: - virtual void OnPowerStateChange(bool on_battery_power) OVERRIDE; - virtual void OnSuspend() OVERRIDE; - virtual void OnResume() OVERRIDE; + void OnPowerStateChange(bool on_battery_power) override; + void OnSuspend() override; + void OnResume() override; private: DISALLOW_COPY_AND_ASSIGN(PowerMonitor); diff --git a/atom/browser/api/atom_api_protocol.cc b/atom/browser/api/atom_api_protocol.cc index 446a40404678..0d0adb3eb018 100644 --- a/atom/browser/api/atom_api_protocol.cc +++ b/atom/browser/api/atom_api_protocol.cc @@ -53,7 +53,7 @@ class CustomProtocolRequestJob : public AdapterRequestJob { } // AdapterRequestJob: - virtual void GetJobTypeInUI() OVERRIDE { + void GetJobTypeInUI() override { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); v8::Isolate* isolate = v8::Isolate::GetCurrent(); @@ -128,9 +128,9 @@ class CustomProtocolHandler : public ProtocolHandler { : registry_(registry), protocol_handler_(protocol_handler) { } - virtual net::URLRequestJob* MaybeCreateJob( + net::URLRequestJob* MaybeCreateJob( net::URLRequest* request, - net::NetworkDelegate* network_delegate) const OVERRIDE { + net::NetworkDelegate* network_delegate) const override { return new CustomProtocolRequestJob(registry_, protocol_handler_.get(), request, network_delegate); } diff --git a/atom/browser/api/event.h b/atom/browser/api/event.h index b72f4761b6ba..5cdc08324b72 100644 --- a/atom/browser/api/event.h +++ b/atom/browser/api/event.h @@ -34,10 +34,10 @@ class Event : public Wrappable, virtual ~Event(); // Wrappable implementations: - virtual ObjectTemplateBuilder GetObjectTemplateBuilder(v8::Isolate* isolate); + ObjectTemplateBuilder GetObjectTemplateBuilder(v8::Isolate* isolate) override; // content::WebContentsObserver implementations: - virtual void WebContentsDestroyed() OVERRIDE; + void WebContentsDestroyed() override; private: // Replyer for the synchronous messages. diff --git a/atom/browser/atom_access_token_store.h b/atom/browser/atom_access_token_store.h index fe810abb5515..f2b734a20695 100644 --- a/atom/browser/atom_access_token_store.h +++ b/atom/browser/atom_access_token_store.h @@ -17,10 +17,10 @@ class AtomAccessTokenStore : public content::AccessTokenStore { virtual ~AtomAccessTokenStore(); // content::AccessTokenStore: - virtual void LoadAccessTokens( - const LoadAccessTokensCallbackType& callback) OVERRIDE; - virtual void SaveAccessToken(const GURL& server_url, - const base::string16& access_token) OVERRIDE; + void LoadAccessTokens( + const LoadAccessTokensCallbackType& callback) override; + void SaveAccessToken(const GURL& server_url, + const base::string16& access_token) override; private: DISALLOW_COPY_AND_ASSIGN(AtomAccessTokenStore); diff --git a/atom/browser/atom_browser_main_parts.h b/atom/browser/atom_browser_main_parts.h index 24f55b5495a0..a825862ff9be 100644 --- a/atom/browser/atom_browser_main_parts.h +++ b/atom/browser/atom_browser_main_parts.h @@ -27,14 +27,14 @@ class AtomBrowserMainParts : public brightray::BrowserMainParts { protected: // Implementations of brightray::BrowserMainParts. - virtual brightray::BrowserContext* CreateBrowserContext() OVERRIDE; + brightray::BrowserContext* CreateBrowserContext() override; // Implementations of content::BrowserMainParts. - virtual void PostEarlyInitialization() OVERRIDE; - virtual void PreMainMessageLoopRun() OVERRIDE; + void PostEarlyInitialization() override; + void PreMainMessageLoopRun() override; #if defined(OS_MACOSX) - virtual void PreMainMessageLoopStart() OVERRIDE; - virtual void PostDestroyThreads() OVERRIDE; + void PreMainMessageLoopStart() override; + void PostDestroyThreads() override; #endif private: diff --git a/atom/browser/atom_javascript_dialog_manager.h b/atom/browser/atom_javascript_dialog_manager.h index 05095a12c449..3712b81a49fc 100644 --- a/atom/browser/atom_javascript_dialog_manager.h +++ b/atom/browser/atom_javascript_dialog_manager.h @@ -14,7 +14,7 @@ namespace atom { class AtomJavaScriptDialogManager : public content::JavaScriptDialogManager { public: // content::JavaScriptDialogManager implementations. - virtual void RunJavaScriptDialog( + void RunJavaScriptDialog( content::WebContents* web_contents, const GURL& origin_url, const std::string& accept_lang, @@ -22,16 +22,15 @@ class AtomJavaScriptDialogManager : public content::JavaScriptDialogManager { const base::string16& message_text, const base::string16& default_prompt_text, const DialogClosedCallback& callback, - bool* did_suppress_message) OVERRIDE; - virtual void RunBeforeUnloadDialog( + bool* did_suppress_message) override; + void RunBeforeUnloadDialog( content::WebContents* web_contents, const base::string16& message_text, bool is_reload, - const DialogClosedCallback& callback) OVERRIDE; - virtual void CancelActiveAndPendingDialogs( - content::WebContents* web_contents) OVERRIDE {} - virtual void WebContentsDestroyed( - content::WebContents* web_contents) OVERRIDE {} + const DialogClosedCallback& callback) override; + void CancelActiveAndPendingDialogs( + content::WebContents* web_contents) override {} + void WebContentsDestroyed(content::WebContents* web_contents) override {} }; } // namespace atom diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc index 9178b43eac64..09fd351f4277 100644 --- a/atom/browser/native_window_views.cc +++ b/atom/browser/native_window_views.cc @@ -129,7 +129,7 @@ class NativeWindowClientView : public views::ClientView { } virtual ~NativeWindowClientView() {} - virtual bool CanClose() OVERRIDE { + bool CanClose() override { static_cast(contents_view())->CloseWebContents(); return false; } diff --git a/atom/browser/net/adapter_request_job.h b/atom/browser/net/adapter_request_job.h index 98a32b93b70e..557b8d61e907 100644 --- a/atom/browser/net/adapter_request_job.h +++ b/atom/browser/net/adapter_request_job.h @@ -28,16 +28,16 @@ class AdapterRequestJob : public net::URLRequestJob { public: // net::URLRequestJob: - virtual void Start() OVERRIDE; - virtual void Kill() OVERRIDE; - virtual bool ReadRawData(net::IOBuffer* buf, - int buf_size, - int *bytes_read) OVERRIDE; - virtual bool IsRedirectResponse(GURL* location, - int* http_status_code) OVERRIDE; - virtual net::Filter* SetupFilter() const OVERRIDE; - virtual bool GetMimeType(std::string* mime_type) const OVERRIDE; - virtual bool GetCharset(std::string* charset) OVERRIDE; + void Start() override; + void Kill() override; + bool ReadRawData(net::IOBuffer* buf, + int buf_size, + int *bytes_read) override; + bool IsRedirectResponse(GURL* location, + int* http_status_code) override; + net::Filter* SetupFilter() const override; + bool GetMimeType(std::string* mime_type) const override; + bool GetCharset(std::string* charset) override; base::WeakPtr GetWeakPtr(); diff --git a/atom/browser/net/asar/asar_protocol_handler.h b/atom/browser/net/asar/asar_protocol_handler.h index e0a66ca43545..cbfc95b8f778 100644 --- a/atom/browser/net/asar/asar_protocol_handler.h +++ b/atom/browser/net/asar/asar_protocol_handler.h @@ -27,10 +27,10 @@ class AsarProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler { Archive* GetOrCreateAsarArchive(const base::FilePath& path) const; // net::URLRequestJobFactory::ProtocolHandler: - virtual net::URLRequestJob* MaybeCreateJob( + net::URLRequestJob* MaybeCreateJob( net::URLRequest* request, - net::NetworkDelegate* network_delegate) const OVERRIDE; - virtual bool IsSafeRedirectTarget(const GURL& location) const OVERRIDE; + net::NetworkDelegate* network_delegate) const override; + bool IsSafeRedirectTarget(const GURL& location) const override; private: const scoped_refptr file_task_runner_; diff --git a/atom/browser/net/asar/url_request_asar_job.h b/atom/browser/net/asar/url_request_asar_job.h index 63f014da8175..899976471f0e 100644 --- a/atom/browser/net/asar/url_request_asar_job.h +++ b/atom/browser/net/asar/url_request_asar_job.h @@ -32,12 +32,12 @@ class URLRequestAsarJob : public net::URLRequestJob { const scoped_refptr& file_task_runner); // net::URLRequestJob: - virtual void Start() OVERRIDE; - virtual void Kill() OVERRIDE; - virtual bool ReadRawData(net::IOBuffer* buf, - int buf_size, - int* bytes_read) OVERRIDE; - virtual bool GetMimeType(std::string* mime_type) const OVERRIDE; + void Start() override; + void Kill() override; + bool ReadRawData(net::IOBuffer* buf, + int buf_size, + int* bytes_read) override; + bool GetMimeType(std::string* mime_type) const override; protected: virtual ~URLRequestAsarJob(); diff --git a/atom/browser/net/atom_url_request_job_factory.h b/atom/browser/net/atom_url_request_job_factory.h index 9150f2f578d2..77e5d54a3b9b 100644 --- a/atom/browser/net/atom_url_request_job_factory.h +++ b/atom/browser/net/atom_url_request_job_factory.h @@ -40,13 +40,13 @@ class AtomURLRequestJobFactory : public net::URLRequestJobFactory { bool HasProtocolHandler(const std::string& scheme) const; // URLRequestJobFactory implementation - virtual net::URLRequestJob* MaybeCreateJobWithProtocolHandler( + net::URLRequestJob* MaybeCreateJobWithProtocolHandler( const std::string& scheme, net::URLRequest* request, - net::NetworkDelegate* network_delegate) const OVERRIDE; - virtual bool IsHandledProtocol(const std::string& scheme) const OVERRIDE; - virtual bool IsHandledURL(const GURL& url) const OVERRIDE; - virtual bool IsSafeRedirectTarget(const GURL& location) const OVERRIDE; + net::NetworkDelegate* network_delegate) const override; + bool IsHandledProtocol(const std::string& scheme) const override; + bool IsHandledURL(const GURL& url) const override; + bool IsSafeRedirectTarget(const GURL& location) const override; private: typedef std::map ProtocolHandlerMap; diff --git a/atom/browser/net/url_request_string_job.h b/atom/browser/net/url_request_string_job.h index c2cce672485c..7ad250466aba 100644 --- a/atom/browser/net/url_request_string_job.h +++ b/atom/browser/net/url_request_string_job.h @@ -20,10 +20,10 @@ class URLRequestStringJob : public net::URLRequestSimpleJob { const std::string& data); // URLRequestSimpleJob: - virtual int GetData(std::string* mime_type, - std::string* charset, - std::string* data, - const net::CompletionCallback& callback) const OVERRIDE; + int GetData(std::string* mime_type, + std::string* charset, + std::string* data, + const net::CompletionCallback& callback) const override; private: std::string mime_type_; diff --git a/atom/browser/node_debugger.h b/atom/browser/node_debugger.h index 04a79c52164f..6ee5b1e20688 100644 --- a/atom/browser/node_debugger.h +++ b/atom/browser/node_debugger.h @@ -33,12 +33,12 @@ class NodeDebugger : public net::StreamListenSocket::Delegate { static void DebugMessageHandler(const v8::Debug::Message& message); // net::StreamListenSocket::Delegate: - virtual void DidAccept(net::StreamListenSocket* server, - scoped_ptr socket) OVERRIDE; - virtual void DidRead(net::StreamListenSocket* socket, - const char* data, - int len) OVERRIDE; - virtual void DidClose(net::StreamListenSocket* socket) OVERRIDE; + void DidAccept(net::StreamListenSocket* server, + scoped_ptr socket) override; + void DidRead(net::StreamListenSocket* socket, + const char* data, + int len) override; + void DidClose(net::StreamListenSocket* socket) override; v8::Isolate* isolate_; diff --git a/atom/browser/ui/tray_icon_cocoa.h b/atom/browser/ui/tray_icon_cocoa.h index 8d0cd5d5e290..5723cb6b2196 100644 --- a/atom/browser/ui/tray_icon_cocoa.h +++ b/atom/browser/ui/tray_icon_cocoa.h @@ -22,12 +22,12 @@ class TrayIconCocoa : public TrayIcon { TrayIconCocoa(); virtual ~TrayIconCocoa(); - virtual void SetImage(const gfx::Image& image) OVERRIDE; - virtual void SetPressedImage(const gfx::Image& image) OVERRIDE; - virtual void SetToolTip(const std::string& tool_tip) OVERRIDE; - virtual void SetTitle(const std::string& title) OVERRIDE; - virtual void SetHighlightMode(bool highlight) OVERRIDE; - virtual void SetContextMenu(ui::SimpleMenuModel* menu_model) OVERRIDE; + void SetImage(const gfx::Image& image) override; + void SetPressedImage(const gfx::Image& image) override; + void SetToolTip(const std::string& tool_tip) override; + void SetTitle(const std::string& title) override; + void SetHighlightMode(bool highlight) override; + void SetContextMenu(ui::SimpleMenuModel* menu_model) override; private: base::scoped_nsobject item_; diff --git a/atom/browser/ui/tray_icon_gtk.h b/atom/browser/ui/tray_icon_gtk.h index ce9ae3cf2b7e..2be3259f218d 100644 --- a/atom/browser/ui/tray_icon_gtk.h +++ b/atom/browser/ui/tray_icon_gtk.h @@ -23,14 +23,14 @@ class TrayIconGtk : public TrayIcon, virtual ~TrayIconGtk(); // TrayIcon: - virtual void SetImage(const gfx::Image& image) OVERRIDE; - virtual void SetToolTip(const std::string& tool_tip) OVERRIDE; - virtual void SetContextMenu(ui::SimpleMenuModel* menu_model) OVERRIDE; + void SetImage(const gfx::Image& image) override; + void SetToolTip(const std::string& tool_tip) override; + void SetContextMenu(ui::SimpleMenuModel* menu_model) override; private: // views::StatusIconLinux::Delegate: - virtual void OnClick() OVERRIDE; - virtual bool HasClickAction() OVERRIDE; + void OnClick() override; + bool HasClickAction() override; scoped_ptr icon_; diff --git a/atom/common/crash_reporter/crash_reporter_linux.h b/atom/common/crash_reporter/crash_reporter_linux.h index c1055aded110..2f7d639e9075 100644 --- a/atom/common/crash_reporter/crash_reporter_linux.h +++ b/atom/common/crash_reporter/crash_reporter_linux.h @@ -25,13 +25,13 @@ class CrashReporterLinux : public CrashReporter { public: static CrashReporterLinux* GetInstance(); - virtual void InitBreakpad(const std::string& product_name, - const std::string& version, - const std::string& company_name, - const std::string& submit_url, - bool auto_submit, - bool skip_system_crash_handler) OVERRIDE; - virtual void SetUploadParameters() OVERRIDE; + void InitBreakpad(const std::string& product_name, + const std::string& version, + const std::string& company_name, + const std::string& submit_url, + bool auto_submit, + bool skip_system_crash_handler) override; + void SetUploadParameters() override; private: friend struct DefaultSingletonTraits; diff --git a/atom/common/crash_reporter/crash_reporter_mac.h b/atom/common/crash_reporter/crash_reporter_mac.h index 8467294643b4..882744db3c7e 100644 --- a/atom/common/crash_reporter/crash_reporter_mac.h +++ b/atom/common/crash_reporter/crash_reporter_mac.h @@ -19,13 +19,13 @@ class CrashReporterMac : public CrashReporter { public: static CrashReporterMac* GetInstance(); - virtual void InitBreakpad(const std::string& product_name, - const std::string& version, - const std::string& company_name, - const std::string& submit_url, - bool auto_submit, - bool skip_system_crash_handler) OVERRIDE; - virtual void SetUploadParameters() OVERRIDE; + void InitBreakpad(const std::string& product_name, + const std::string& version, + const std::string& company_name, + const std::string& submit_url, + bool auto_submit, + bool skip_system_crash_handler) override; + void SetUploadParameters() override; private: friend struct DefaultSingletonTraits; diff --git a/atom/common/crash_reporter/crash_reporter_win.h b/atom/common/crash_reporter/crash_reporter_win.h index 369503458391..72b9411d2191 100644 --- a/atom/common/crash_reporter/crash_reporter_win.h +++ b/atom/common/crash_reporter/crash_reporter_win.h @@ -21,13 +21,13 @@ class CrashReporterWin : public CrashReporter { public: static CrashReporterWin* GetInstance(); - virtual void InitBreakpad(const std::string& product_name, - const std::string& version, - const std::string& company_name, - const std::string& submit_url, - bool auto_submit, - bool skip_system_crash_handler) OVERRIDE; - virtual void SetUploadParameters() OVERRIDE; + void InitBreakpad(const std::string& product_name, + const std::string& version, + const std::string& company_name, + const std::string& submit_url, + bool auto_submit, + bool skip_system_crash_handler) override; + void SetUploadParameters() override; private: friend struct DefaultSingletonTraits; diff --git a/atom/renderer/atom_render_view_observer.h b/atom/renderer/atom_render_view_observer.h index 2745c5d8c3ea..4b9d59f3fa08 100644 --- a/atom/renderer/atom_render_view_observer.h +++ b/atom/renderer/atom_render_view_observer.h @@ -26,9 +26,9 @@ class AtomRenderViewObserver : public content::RenderViewObserver { private: // content::RenderViewObserver implementation. - virtual void DidCreateDocumentElement(blink::WebLocalFrame* frame) OVERRIDE; - virtual void DraggableRegionsChanged(blink::WebFrame* frame) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + void DidCreateDocumentElement(blink::WebLocalFrame* frame) override; + void DraggableRegionsChanged(blink::WebFrame* frame) override; + bool OnMessageReceived(const IPC::Message& message) override; void OnBrowserMessage(const base::string16& channel, const base::ListValue& args); diff --git a/chromium_src/chrome/browser/printing/printing_message_filter.h b/chromium_src/chrome/browser/printing/printing_message_filter.h index 5f437864c176..410b6245786d 100644 --- a/chromium_src/chrome/browser/printing/printing_message_filter.h +++ b/chromium_src/chrome/browser/printing/printing_message_filter.h @@ -40,10 +40,10 @@ class PrintingMessageFilter : public content::BrowserMessageFilter { PrintingMessageFilter(int render_process_id); // content::BrowserMessageFilter methods. - virtual void OverrideThreadForMessage( + void OverrideThreadForMessage( const IPC::Message& message, - content::BrowserThread::ID* thread) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + content::BrowserThread::ID* thread) override; + bool OnMessageReceived(const IPC::Message& message) override; private: virtual ~PrintingMessageFilter(); diff --git a/chromium_src/chrome/browser/speech/tts_message_filter.h b/chromium_src/chrome/browser/speech/tts_message_filter.h index ba3f98b33111..b09565161190 100644 --- a/chromium_src/chrome/browser/speech/tts_message_filter.h +++ b/chromium_src/chrome/browser/speech/tts_message_filter.h @@ -23,21 +23,21 @@ class TtsMessageFilter content::BrowserContext* browser_context); // content::BrowserMessageFilter implementation. - virtual void OverrideThreadForMessage( + void OverrideThreadForMessage( const IPC::Message& message, - content::BrowserThread::ID* thread) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void OnChannelClosing() OVERRIDE; - virtual void OnDestruct() const OVERRIDE; + content::BrowserThread::ID* thread) override; + bool OnMessageReceived(const IPC::Message& message) override; + void OnChannelClosing() override; + void OnDestruct() const override; // UtteranceEventDelegate implementation. - virtual void OnTtsEvent(Utterance* utterance, - TtsEventType event_type, - int char_index, - const std::string& error_message) OVERRIDE; + void OnTtsEvent(Utterance* utterance, + TtsEventType event_type, + int char_index, + const std::string& error_message) override; // VoicesChangedDelegate implementation. - virtual void OnVoicesChanged() OVERRIDE; + void OnVoicesChanged() override; private: friend class content::BrowserThread; @@ -61,4 +61,4 @@ class TtsMessageFilter DISALLOW_COPY_AND_ASSIGN(TtsMessageFilter); }; -#endif // CHROME_BROWSER_SPEECH_TTS_MESSAGE_FILTER_H_ \ No newline at end of file +#endif // CHROME_BROWSER_SPEECH_TTS_MESSAGE_FILTER_H_