diff options
| author | mohan.reddy <mohan.reddy@samsung.com> | 2014-10-09 19:08:05 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-10 02:08:18 +0000 |
| commit | 54170a07df0ff322b35a933a0604856d5594a1e8 (patch) | |
| tree | 9b8e220bc7489b3006f8e92fc8f7cdc6a0d9883a /chrome | |
| parent | f519af97a9fd1bc46f9d4151c9dd94ebe57b289d (diff) | |
| download | chromium_src-54170a07df0ff322b35a933a0604856d5594a1e8.zip chromium_src-54170a07df0ff322b35a933a0604856d5594a1e8.tar.gz chromium_src-54170a07df0ff322b35a933a0604856d5594a1e8.tar.bz2 | |
Replacing the OVERRIDE with override and in chrome/renderer
This step is a giant search and replace for OVERRIDE to
replace them with their lowercase versions.
BUG=417463
Review URL: https://codereview.chromium.org/630603003
Cr-Commit-Position: refs/heads/master@{#299042}
Diffstat (limited to 'chrome')
73 files changed, 257 insertions, 257 deletions
diff --git a/chrome/renderer/autofill/autofill_renderer_browsertest.cc b/chrome/renderer/autofill/autofill_renderer_browsertest.cc index 66e3a6c..b3e7100 100644 --- a/chrome/renderer/autofill/autofill_renderer_browsertest.cc +++ b/chrome/renderer/autofill/autofill_renderer_browsertest.cc @@ -45,7 +45,7 @@ class AutofillRendererTest : public ChromeRenderViewTest { virtual ~AutofillRendererTest() {} protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ChromeRenderViewTest::SetUp(); // Don't want any delay for form state sync changes. This will still post a @@ -254,7 +254,7 @@ class RequestAutocompleteRendererTest : public AutofillRendererTest { virtual ~RequestAutocompleteRendererTest() {} protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AutofillRendererTest::SetUp(); // Bypass the HTTPS-only restriction to show requestAutocomplete. @@ -295,7 +295,7 @@ class RequestAutocompleteRendererTest : public AutofillRendererTest { render_thread_->sink().ClearMessages(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { invoking_form_.reset(); AutofillRendererTest::TearDown(); } diff --git a/chrome/renderer/autofill/page_click_tracker_browsertest.cc b/chrome/renderer/autofill/page_click_tracker_browsertest.cc index 657094c..fec5098 100644 --- a/chrome/renderer/autofill/page_click_tracker_browsertest.cc +++ b/chrome/renderer/autofill/page_click_tracker_browsertest.cc @@ -25,7 +25,7 @@ class TestPageClickListener : public PageClickListener { virtual void FormControlElementClicked( const blink::WebFormControlElement& element, - bool was_focused) OVERRIDE { + bool was_focused) override { form_control_element_clicked_called_ = true; form_control_element_clicked_ = element; was_focused_ = was_focused; @@ -44,7 +44,7 @@ class TestPageClickListener : public PageClickListener { class PageClickTrackerTest : public content::RenderViewTest { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { content::RenderViewTest::SetUp(); // RenderView creates PageClickTracker but it doesn't keep it around. @@ -67,7 +67,7 @@ class PageClickTrackerTest : public content::RenderViewTest { ASSERT_FALSE(textarea_.isNull()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { text_.reset(); textarea_.reset(); test_listener_.ClearResults(); diff --git a/chrome/renderer/benchmarking_extension.cc b/chrome/renderer/benchmarking_extension.cc index 17df80b..d5ddd27 100644 --- a/chrome/renderer/benchmarking_extension.cc +++ b/chrome/renderer/benchmarking_extension.cc @@ -61,7 +61,7 @@ class BenchmarkingWrapper : public v8::Extension { virtual v8::Handle<v8::FunctionTemplate> GetNativeFunctionTemplate( v8::Isolate* isolate, - v8::Handle<v8::String> name) OVERRIDE { + v8::Handle<v8::String> name) override { if (name->Equals(v8::String::NewFromUtf8(isolate, "GetCounter"))) { return v8::FunctionTemplate::New(isolate, GetCounter); } else if (name->Equals( diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index 1c00616..0da8e20 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -214,7 +214,7 @@ class SpellCheckReplacer : public content::RenderViewVisitor { public: explicit SpellCheckReplacer(SpellCheck* spellcheck) : spellcheck_(spellcheck) {} - virtual bool Visit(content::RenderView* render_view) OVERRIDE; + virtual bool Visit(content::RenderView* render_view) override; private: SpellCheck* spellcheck_; // New shared spellcheck for all views. Weak Ptr. diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h index f8cfbb0..5a6caf58 100644 --- a/chrome/renderer/chrome_content_renderer_client.h +++ b/chrome/renderer/chrome_content_renderer_client.h @@ -75,78 +75,78 @@ class ChromeContentRendererClient : public content::ContentRendererClient { ChromeContentRendererClient(); virtual ~ChromeContentRendererClient(); - virtual void RenderThreadStarted() OVERRIDE; - virtual void RenderFrameCreated(content::RenderFrame* render_frame) OVERRIDE; - virtual void RenderViewCreated(content::RenderView* render_view) OVERRIDE; - virtual void SetNumberOfViews(int number_of_views) OVERRIDE; - virtual SkBitmap* GetSadPluginBitmap() OVERRIDE; - virtual SkBitmap* GetSadWebViewBitmap() OVERRIDE; - virtual std::string GetDefaultEncoding() OVERRIDE; + virtual void RenderThreadStarted() override; + virtual void RenderFrameCreated(content::RenderFrame* render_frame) override; + virtual void RenderViewCreated(content::RenderView* render_view) override; + virtual void SetNumberOfViews(int number_of_views) override; + virtual SkBitmap* GetSadPluginBitmap() override; + virtual SkBitmap* GetSadWebViewBitmap() override; + virtual std::string GetDefaultEncoding() override; virtual bool OverrideCreatePlugin( content::RenderFrame* render_frame, blink::WebLocalFrame* frame, const blink::WebPluginParams& params, - blink::WebPlugin** plugin) OVERRIDE; + blink::WebPlugin** plugin) override; virtual blink::WebPlugin* CreatePluginReplacement( content::RenderFrame* render_frame, - const base::FilePath& plugin_path) OVERRIDE; + const base::FilePath& plugin_path) override; virtual bool HasErrorPage(int http_status_code, - std::string* error_domain) OVERRIDE; + std::string* error_domain) override; virtual bool ShouldSuppressErrorPage(content::RenderFrame* render_frame, - const GURL& url) OVERRIDE; + const GURL& url) override; virtual void GetNavigationErrorStrings( content::RenderView* render_view, blink::WebFrame* frame, const blink::WebURLRequest& failed_request, const blink::WebURLError& error, std::string* error_html, - base::string16* error_description) OVERRIDE; + base::string16* error_description) override; virtual void DeferMediaLoad(content::RenderFrame* render_frame, - const base::Closure& closure) OVERRIDE; - virtual bool RunIdleHandlerWhenWidgetsHidden() OVERRIDE; - virtual bool AllowPopup() OVERRIDE; + const base::Closure& closure) override; + virtual bool RunIdleHandlerWhenWidgetsHidden() override; + virtual bool AllowPopup() override; virtual bool ShouldFork(blink::WebFrame* frame, const GURL& url, const std::string& http_method, bool is_initial_navigation, bool is_server_redirect, - bool* send_referrer) OVERRIDE; + bool* send_referrer) override; virtual bool WillSendRequest(blink::WebFrame* frame, ui::PageTransition transition_type, const GURL& url, const GURL& first_party_for_cookies, - GURL* new_url) OVERRIDE; + GURL* new_url) override; virtual void DidCreateScriptContext(blink::WebFrame* frame, v8::Handle<v8::Context> context, int extension_group, - int world_id) OVERRIDE; + int world_id) override; virtual unsigned long long VisitedLinkHash(const char* canonical_url, - size_t length) OVERRIDE; - virtual bool IsLinkVisited(unsigned long long link_hash) OVERRIDE; - virtual blink::WebPrescientNetworking* GetPrescientNetworking() OVERRIDE; + size_t length) override; + virtual bool IsLinkVisited(unsigned long long link_hash) override; + virtual blink::WebPrescientNetworking* GetPrescientNetworking() override; virtual bool ShouldOverridePageVisibilityState( const content::RenderFrame* render_frame, - blink::WebPageVisibilityState* override_state) OVERRIDE; + blink::WebPageVisibilityState* override_state) override; virtual const void* CreatePPAPIInterface( - const std::string& interface_name) OVERRIDE; - virtual bool IsExternalPepperPlugin(const std::string& module_name) OVERRIDE; + const std::string& interface_name) override; + virtual bool IsExternalPepperPlugin(const std::string& module_name) override; virtual blink::WebSpeechSynthesizer* OverrideSpeechSynthesizer( - blink::WebSpeechSynthesizerClient* client) OVERRIDE; + blink::WebSpeechSynthesizerClient* client) override; virtual bool ShouldReportDetailedMessageForSource( - const base::string16& source) const OVERRIDE; - virtual bool ShouldEnableSiteIsolationPolicy() const OVERRIDE; + const base::string16& source) const override; + virtual bool ShouldEnableSiteIsolationPolicy() const override; virtual blink::WebWorkerPermissionClientProxy* CreateWorkerPermissionClientProxy(content::RenderFrame* render_frame, - blink::WebFrame* frame) OVERRIDE; - virtual bool AllowPepperMediaStreamAPI(const GURL& url) OVERRIDE; + blink::WebFrame* frame) override; + virtual bool AllowPepperMediaStreamAPI(const GURL& url) override; virtual void AddKeySystems( - std::vector<content::KeySystemInfo>* key_systems) OVERRIDE; - virtual bool IsPluginAllowedToUseDevChannelAPIs() OVERRIDE; - virtual bool IsPluginAllowedToUseCompositorAPI(const GURL& url) OVERRIDE; - virtual bool IsPluginAllowedToUseVideoDecodeAPI(const GURL& url) OVERRIDE; + std::vector<content::KeySystemInfo>* key_systems) override; + virtual bool IsPluginAllowedToUseDevChannelAPIs() override; + virtual bool IsPluginAllowedToUseCompositorAPI(const GURL& url) override; + virtual bool IsPluginAllowedToUseVideoDecodeAPI(const GURL& url) override; virtual content::BrowserPluginDelegate* CreateBrowserPluginDelegate( content::RenderFrame* render_frame, - const std::string& mime_type) OVERRIDE; + const std::string& mime_type) override; #if defined(ENABLE_EXTENSIONS) // Takes ownership. diff --git a/chrome/renderer/chrome_mock_render_thread.h b/chrome/renderer/chrome_mock_render_thread.h index 72a8f2a..9b5afaa 100644 --- a/chrome/renderer/chrome_mock_render_thread.h +++ b/chrome/renderer/chrome_mock_render_thread.h @@ -32,7 +32,7 @@ class ChromeMockRenderThread : public content::MockRenderThread { // content::RenderThread overrides. virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() - OVERRIDE; + override; ////////////////////////////////////////////////////////////////////////// // The following functions are called by the test itself. @@ -59,7 +59,7 @@ class ChromeMockRenderThread : public content::MockRenderThread { private: // Overrides base class implementation to add custom handling for // print and extensions. - virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& msg) override; // The callee expects to be returned a valid channel_id. void OnOpenChannelToExtension(int routing_id, diff --git a/chrome/renderer/chrome_render_frame_observer.h b/chrome/renderer/chrome_render_frame_observer.h index 643533d..2dfb247 100644 --- a/chrome/renderer/chrome_render_frame_observer.h +++ b/chrome/renderer/chrome_render_frame_observer.h @@ -21,7 +21,7 @@ class ChromeRenderFrameObserver : public content::RenderFrameObserver { private: // RenderFrameObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; // IPC handlers void OnSetIsPrerendering(bool is_prerendering); diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc index b25d9b7..87a69fc 100644 --- a/chrome/renderer/chrome_render_process_observer.cc +++ b/chrome/renderer/chrome_render_process_observer.cc @@ -70,7 +70,7 @@ class RendererResourceDelegate : public content::ResourceDispatcherDelegate { virtual content::RequestPeer* OnRequestComplete( content::RequestPeer* current_peer, content::ResourceType resource_type, - int error_code) OVERRIDE { + int error_code) override { // Update the browser about our cache. // Rate limit informing the host of our cache stats. if (!weak_factory_.HasWeakPtrs()) { @@ -93,7 +93,7 @@ class RendererResourceDelegate : public content::ResourceDispatcherDelegate { virtual content::RequestPeer* OnReceivedResponse( content::RequestPeer* current_peer, const std::string& mime_type, - const GURL& url) OVERRIDE { + const GURL& url) override { #if defined(ENABLE_EXTENSIONS) return ExtensionLocalizationPeer::CreateExtensionLocalizationPeer( current_peer, RenderThread::Get(), mime_type, url); diff --git a/chrome/renderer/chrome_render_process_observer.h b/chrome/renderer/chrome_render_process_observer.h index 643d747..fe53bdb 100644 --- a/chrome/renderer/chrome_render_process_observer.h +++ b/chrome/renderer/chrome_render_process_observer.h @@ -39,9 +39,9 @@ class ChromeRenderProcessObserver : public content::RenderProcessObserver { private: // RenderProcessObserver implementation. - virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void WebKitInitialized() OVERRIDE; - virtual void OnRenderProcessShutdown() OVERRIDE; + virtual bool OnControlMessageReceived(const IPC::Message& message) override; + virtual void WebKitInitialized() override; + virtual void OnRenderProcessShutdown() override; void OnSetIsIncognitoProcess(bool is_incognito_process); void OnSetContentSettingsForCurrentURL( diff --git a/chrome/renderer/chrome_render_view_observer.h b/chrome/renderer/chrome_render_view_observer.h index b2df6e2..843e8bc 100644 --- a/chrome/renderer/chrome_render_view_observer.h +++ b/chrome/renderer/chrome_render_view_observer.h @@ -53,12 +53,12 @@ class ChromeRenderViewObserver : public content::RenderViewObserver { private: // RenderViewObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void DidStartLoading() OVERRIDE; - virtual void DidStopLoading() OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; + virtual void DidStartLoading() override; + virtual void DidStopLoading() override; virtual void DidCommitProvisionalLoad(blink::WebLocalFrame* frame, - bool is_new_navigation) OVERRIDE; - virtual void Navigate(const GURL& url) OVERRIDE; + bool is_new_navigation) override; + virtual void Navigate(const GURL& url) override; #if !defined(OS_ANDROID) && !defined(OS_IOS) void OnWebUIJavaScript(const base::string16& javascript); diff --git a/chrome/renderer/content_settings_observer.h b/chrome/renderer/content_settings_observer.h index 521710b..4e084fb 100644 --- a/chrome/renderer/content_settings_observer.h +++ b/chrome/renderer/content_settings_observer.h @@ -51,32 +51,32 @@ class ContentSettingsObserver // blink::WebPermissionClient implementation. virtual bool allowDatabase(const blink::WebString& name, const blink::WebString& display_name, - unsigned long estimated_size) OVERRIDE; + unsigned long estimated_size) override; virtual void requestFileSystemAccessAsync( - const blink::WebPermissionCallbacks& callbacks) OVERRIDE; + const blink::WebPermissionCallbacks& callbacks) override; virtual bool allowImage(bool enabled_per_settings, - const blink::WebURL& image_url) OVERRIDE; + const blink::WebURL& image_url) override; virtual bool allowIndexedDB(const blink::WebString& name, - const blink::WebSecurityOrigin& origin) OVERRIDE; - virtual bool allowPlugins(bool enabled_per_settings) OVERRIDE; - virtual bool allowScript(bool enabled_per_settings) OVERRIDE; + const blink::WebSecurityOrigin& origin) override; + virtual bool allowPlugins(bool enabled_per_settings) override; + virtual bool allowScript(bool enabled_per_settings) override; virtual bool allowScriptFromSource(bool enabled_per_settings, - const blink::WebURL& script_url) OVERRIDE; - virtual bool allowStorage(bool local) OVERRIDE; - virtual bool allowReadFromClipboard(bool default_value) OVERRIDE; - virtual bool allowWriteToClipboard(bool default_value) OVERRIDE; - virtual bool allowMutationEvents(bool default_value) OVERRIDE; - virtual bool allowPushState() OVERRIDE; - virtual void didNotAllowPlugins() OVERRIDE; - virtual void didNotAllowScript() OVERRIDE; + const blink::WebURL& script_url) override; + virtual bool allowStorage(bool local) override; + virtual bool allowReadFromClipboard(bool default_value) override; + virtual bool allowWriteToClipboard(bool default_value) override; + virtual bool allowMutationEvents(bool default_value) override; + virtual bool allowPushState() override; + virtual void didNotAllowPlugins() override; + virtual void didNotAllowScript() override; virtual bool allowDisplayingInsecureContent( bool allowed_per_settings, const blink::WebSecurityOrigin& context, - const blink::WebURL& url) OVERRIDE; + const blink::WebURL& url) override; virtual bool allowRunningInsecureContent( bool allowed_per_settings, const blink::WebSecurityOrigin& context, - const blink::WebURL& url) OVERRIDE; + const blink::WebURL& url) override; // This is used for cases when the NPAPI plugins malfunction if used. bool AreNPAPIPluginsBlocked() const; @@ -88,8 +88,8 @@ class ContentSettingsObserver FRIEND_TEST_ALL_PREFIXES(ChromeRenderViewTest, PluginsTemporarilyAllowed); // RenderFrameObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void DidCommitProvisionalLoad(bool is_new_navigation) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; + virtual void DidCommitProvisionalLoad(bool is_new_navigation) override; // Message handlers. void OnLoadBlockedPlugins(const std::string& identifier); diff --git a/chrome/renderer/extensions/app_bindings.h b/chrome/renderer/extensions/app_bindings.h index 4634dfb..76ad97e 100644 --- a/chrome/renderer/extensions/app_bindings.h +++ b/chrome/renderer/extensions/app_bindings.h @@ -29,7 +29,7 @@ class AppBindings : public ObjectBackedNativeHandler, private: // IPC::Listener - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; void GetIsInstalled(const v8::FunctionCallbackInfo<v8::Value>& args); void GetDetails(const v8::FunctionCallbackInfo<v8::Value>& args); diff --git a/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h b/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h index faf2540..c5e19c9 100644 --- a/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h +++ b/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h @@ -21,30 +21,30 @@ class ChromeExtensionsDispatcherDelegate const extensions::Extension* extension, extensions::Feature::Context context_type, const extensions::Extension* effective_extension, - extensions::Feature::Context effective_context_type) OVERRIDE; + extensions::Feature::Context effective_context_type) override; virtual void InitOriginPermissions(const extensions::Extension* extension, - bool is_extension_active) OVERRIDE; + bool is_extension_active) override; virtual void RegisterNativeHandlers( extensions::Dispatcher* dispatcher, extensions::ModuleSystem* module_system, - extensions::ScriptContext* context) OVERRIDE; + extensions::ScriptContext* context) override; virtual void PopulateSourceMap( - extensions::ResourceBundleSourceMap* source_map) OVERRIDE; + extensions::ResourceBundleSourceMap* source_map) override; virtual void RequireAdditionalModules(extensions::ScriptContext* context, - bool is_within_platform_app) OVERRIDE; + bool is_within_platform_app) override; virtual void OnActiveExtensionsUpdated( - const std::set<std::string>& extensions_ids) OVERRIDE; - virtual void SetChannel(int channel) OVERRIDE; + const std::set<std::string>& extensions_ids) override; + virtual void SetChannel(int channel) override; virtual void ClearTabSpecificPermissions( const extensions::Dispatcher* dispatcher, int tab_id, - const std::vector<std::string>& extension_ids) OVERRIDE; + const std::vector<std::string>& extension_ids) override; virtual void UpdateTabSpecificPermissions( const extensions::Dispatcher* dispatcher, const GURL& url, int tab_id, const std::string& extension_id, - const extensions::URLPatternSet& origin_set) OVERRIDE; + const extensions::URLPatternSet& origin_set) override; DISALLOW_COPY_AND_ASSIGN(ChromeExtensionsDispatcherDelegate); }; diff --git a/chrome/renderer/extensions/chrome_extensions_renderer_client.h b/chrome/renderer/extensions/chrome_extensions_renderer_client.h index 801bc1aa..be59427 100644 --- a/chrome/renderer/extensions/chrome_extensions_renderer_client.h +++ b/chrome/renderer/extensions/chrome_extensions_renderer_client.h @@ -18,8 +18,8 @@ class ChromeExtensionsRendererClient static ChromeExtensionsRendererClient* GetInstance(); // extensions::ExtensionsRendererClient implementation. - virtual bool IsIncognitoProcess() const OVERRIDE; - virtual int GetLowestIsolatedWorldId() const OVERRIDE; + virtual bool IsIncognitoProcess() const override; + virtual int GetLowestIsolatedWorldId() const override; private: DISALLOW_COPY_AND_ASSIGN(ChromeExtensionsRendererClient); diff --git a/chrome/renderer/extensions/extension_frame_helper.h b/chrome/renderer/extensions/extension_frame_helper.h index 462e21ce..54a43f5 100644 --- a/chrome/renderer/extensions/extension_frame_helper.h +++ b/chrome/renderer/extensions/extension_frame_helper.h @@ -25,8 +25,8 @@ class ExtensionFrameHelper private: // RenderFrameObserver implementation. virtual void WillReleaseScriptContext(v8::Handle<v8::Context>, - int world_id) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + int world_id) override; + virtual bool OnMessageReceived(const IPC::Message& message) override; // IPC handlers. void OnAddMessageToConsole(content::ConsoleMessageLevel level, diff --git a/chrome/renderer/extensions/extension_localization_peer.h b/chrome/renderer/extensions/extension_localization_peer.h index 95127cd..0d7fdd1 100644 --- a/chrome/renderer/extensions/extension_localization_peer.h +++ b/chrome/renderer/extensions/extension_localization_peer.h @@ -32,22 +32,22 @@ class ExtensionLocalizationPeer : public content::RequestPeer { const GURL& request_url); // content::RequestPeer methods. - virtual void OnUploadProgress(uint64 position, uint64 size) OVERRIDE; + virtual void OnUploadProgress(uint64 position, uint64 size) override; virtual bool OnReceivedRedirect( const net::RedirectInfo& redirect_info, - const content::ResourceResponseInfo& info) OVERRIDE; + const content::ResourceResponseInfo& info) override; virtual void OnReceivedResponse( - const content::ResourceResponseInfo& info) OVERRIDE; - virtual void OnDownloadedData(int len, int encoded_data_length) OVERRIDE {} + const content::ResourceResponseInfo& info) override; + virtual void OnDownloadedData(int len, int encoded_data_length) override {} virtual void OnReceivedData(const char* data, int data_length, - int encoded_data_length) OVERRIDE; + int encoded_data_length) override; virtual void OnCompletedRequest(int error_code, bool was_ignored_by_handler, bool stale_copy_in_cache, const std::string& security_info, const base::TimeTicks& completion_time, - int64 total_transfer_size) OVERRIDE; + int64 total_transfer_size) override; private: friend class ExtensionLocalizationPeerTest; diff --git a/chrome/renderer/extensions/renderer_permissions_policy_delegate.h b/chrome/renderer/extensions/renderer_permissions_policy_delegate.h index 6934660..45bc564 100644 --- a/chrome/renderer/extensions/renderer_permissions_policy_delegate.h +++ b/chrome/renderer/extensions/renderer_permissions_policy_delegate.h @@ -23,7 +23,7 @@ class RendererPermissionsPolicyDelegate const GURL& top_document_url, int tab_id, int process_id, - std::string* error) OVERRIDE; + std::string* error) override; private: Dispatcher* dispatcher_; diff --git a/chrome/renderer/extensions/renderer_permissions_policy_delegate_unittest.cc b/chrome/renderer/extensions/renderer_permissions_policy_delegate_unittest.cc index 6529f9d..e94cdc2 100644 --- a/chrome/renderer/extensions/renderer_permissions_policy_delegate_unittest.cc +++ b/chrome/renderer/extensions/renderer_permissions_policy_delegate_unittest.cc @@ -26,7 +26,7 @@ class RendererPermissionsPolicyDelegateTest : public testing::Test { RendererPermissionsPolicyDelegateTest() { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { testing::Test::SetUp(); render_thread_.reset(new content::MockRenderThread()); renderer_client_.reset(new TestExtensionsRendererClient); diff --git a/chrome/renderer/extensions/tab_finder.h b/chrome/renderer/extensions/tab_finder.h index 663ec57..358ee5c 100644 --- a/chrome/renderer/extensions/tab_finder.h +++ b/chrome/renderer/extensions/tab_finder.h @@ -26,7 +26,7 @@ class TabFinder : public content::RenderViewVisitor { virtual ~TabFinder(); // content::RenderViewVisitor implementation. - virtual bool Visit(content::RenderView* render_view) OVERRIDE; + virtual bool Visit(content::RenderView* render_view) override; int tab_id_; content::RenderView* view_; diff --git a/chrome/renderer/extensions/webstore_bindings.h b/chrome/renderer/extensions/webstore_bindings.h index c74c90c..cfd677e 100644 --- a/chrome/renderer/extensions/webstore_bindings.h +++ b/chrome/renderer/extensions/webstore_bindings.h @@ -22,7 +22,7 @@ class WebstoreBindings : public ObjectBackedNativeHandler, explicit WebstoreBindings(ScriptContext* context); // IPC::Listener - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; private: void Install(const v8::FunctionCallbackInfo<v8::Value>& args); diff --git a/chrome/renderer/external_extension.cc b/chrome/renderer/external_extension.cc index 5f6d0d2..78bce12 100644 --- a/chrome/renderer/external_extension.cc +++ b/chrome/renderer/external_extension.cc @@ -45,7 +45,7 @@ class ExternalExtensionWrapper : public v8::Extension { // in this class for window.external. virtual v8::Handle<v8::FunctionTemplate> GetNativeFunctionTemplate( v8::Isolate* isolate, - v8::Handle<v8::String> name) OVERRIDE; + v8::Handle<v8::String> name) override; // Helper function to find the RenderView. May return NULL. static RenderView* GetRenderView(); diff --git a/chrome/renderer/loadtimes_extension_bindings.cc b/chrome/renderer/loadtimes_extension_bindings.cc index e29370e..7788b80 100644 --- a/chrome/renderer/loadtimes_extension_bindings.cc +++ b/chrome/renderer/loadtimes_extension_bindings.cc @@ -54,7 +54,7 @@ class LoadTimesExtensionWrapper : public v8::Extension { virtual v8::Handle<v8::FunctionTemplate> GetNativeFunctionTemplate( v8::Isolate* isolate, - v8::Handle<v8::String> name) OVERRIDE { + v8::Handle<v8::String> name) override { if (name->Equals(v8::String::NewFromUtf8(isolate, "GetLoadTimes"))) { return v8::FunctionTemplate::New(isolate, GetLoadTimes); } else if (name->Equals(v8::String::NewFromUtf8(isolate, "GetCSI"))) { diff --git a/chrome/renderer/media/cast_ipc_dispatcher.h b/chrome/renderer/media/cast_ipc_dispatcher.h index 5039284..6dcbf0a 100644 --- a/chrome/renderer/media/cast_ipc_dispatcher.h +++ b/chrome/renderer/media/cast_ipc_dispatcher.h @@ -28,10 +28,10 @@ class CastIPCDispatcher : public IPC::MessageFilter { void RemoveSender(int32 channel_id); // IPC::MessageFilter implementation - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void OnFilterAdded(IPC::Sender* sender) OVERRIDE; - virtual void OnFilterRemoved() OVERRIDE; - virtual void OnChannelClosing() OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; + virtual void OnFilterAdded(IPC::Sender* sender) override; + virtual void OnFilterRemoved() override; + virtual void OnChannelClosing() override; protected: virtual ~CastIPCDispatcher(); diff --git a/chrome/renderer/media/cast_rtp_stream.cc b/chrome/renderer/media/cast_rtp_stream.cc index cf2fdb9..a79e4d5 100644 --- a/chrome/renderer/media/cast_rtp_stream.cc +++ b/chrome/renderer/media/cast_rtp_stream.cc @@ -359,7 +359,7 @@ class CastAudioSink : public base::SupportsWeakPtr<CastAudioSink>, virtual void OnData(const int16* audio_data, int sample_rate, int number_of_channels, - int number_of_frames) OVERRIDE { + int number_of_frames) override { scoped_ptr<media::AudioBus> input_bus; if (resampler_) { input_bus = ResampleData( @@ -416,7 +416,7 @@ class CastAudioSink : public base::SupportsWeakPtr<CastAudioSink>, } // Called on real-time audio thread. - virtual void OnSetFormat(const media::AudioParameters& params) OVERRIDE { + virtual void OnSetFormat(const media::AudioParameters& params) override { if (params.sample_rate() == output_sample_rate_) return; fifo_.reset(new media::AudioFifo( diff --git a/chrome/renderer/media/cast_transport_sender_ipc.h b/chrome/renderer/media/cast_transport_sender_ipc.h index 9e5ad26..be4cbb6 100644 --- a/chrome/renderer/media/cast_transport_sender_ipc.h +++ b/chrome/renderer/media/cast_transport_sender_ipc.h @@ -32,21 +32,21 @@ class CastTransportSenderIPC virtual void InitializeAudio( const media::cast::CastTransportRtpConfig& config, const media::cast::RtcpCastMessageCallback& cast_message_cb, - const media::cast::RtcpRttCallback& rtt_cb) OVERRIDE; + const media::cast::RtcpRttCallback& rtt_cb) override; virtual void InitializeVideo( const media::cast::CastTransportRtpConfig& config, const media::cast::RtcpCastMessageCallback& cast_message_cb, - const media::cast::RtcpRttCallback& rtt_cb) OVERRIDE; + const media::cast::RtcpRttCallback& rtt_cb) override; virtual void InsertFrame(uint32 ssrc, - const media::cast::EncodedFrame& frame) OVERRIDE; + const media::cast::EncodedFrame& frame) override; virtual void SendSenderReport( uint32 ssrc, base::TimeTicks current_time, - uint32 current_time_as_rtp_timestamp) OVERRIDE; + uint32 current_time_as_rtp_timestamp) override; virtual void CancelSendingFrames( uint32 ssrc, - const std::vector<uint32>& frame_ids) OVERRIDE; - virtual void ResendFrameForKickstart(uint32 ssrc, uint32 frame_id) OVERRIDE; + const std::vector<uint32>& frame_ids) override; + virtual void ResendFrameForKickstart(uint32 ssrc, uint32 frame_id) override; void OnNotifyStatusChange( media::cast::CastTransportStatus status); diff --git a/chrome/renderer/media/chrome_webrtc_log_message_delegate.h b/chrome/renderer/media/chrome_webrtc_log_message_delegate.h index 28fe139..40f8ff2 100644 --- a/chrome/renderer/media/chrome_webrtc_log_message_delegate.h +++ b/chrome/renderer/media/chrome_webrtc_log_message_delegate.h @@ -34,7 +34,7 @@ class ChromeWebRtcLogMessageDelegate virtual ~ChromeWebRtcLogMessageDelegate(); // content::WebRtcLogMessageDelegate implementation. - virtual void LogMessage(const std::string& message) OVERRIDE; + virtual void LogMessage(const std::string& message) override; void OnFilterRemoved(); diff --git a/chrome/renderer/media/mock_webrtc_logging_message_filter.h b/chrome/renderer/media/mock_webrtc_logging_message_filter.h index 1116942..25925f4 100644 --- a/chrome/renderer/media/mock_webrtc_logging_message_filter.h +++ b/chrome/renderer/media/mock_webrtc_logging_message_filter.h @@ -14,8 +14,8 @@ class MockWebRtcLoggingMessageFilter const scoped_refptr<base::MessageLoopProxy>& io_message_loop); virtual void AddLogMessages( - const std::vector<WebRtcLoggingMessageData>& messages) OVERRIDE; - virtual void LoggingStopped() OVERRIDE; + const std::vector<WebRtcLoggingMessageData>& messages) override; + virtual void LoggingStopped() override; ChromeWebRtcLogMessageDelegate* log_message_delegate() { return log_message_delegate_; diff --git a/chrome/renderer/media/webrtc_logging_message_filter.h b/chrome/renderer/media/webrtc_logging_message_filter.h index f608c21..28a82a5 100644 --- a/chrome/renderer/media/webrtc_logging_message_filter.h +++ b/chrome/renderer/media/webrtc_logging_message_filter.h @@ -47,10 +47,10 @@ class WebRtcLoggingMessageFilter : public IPC::MessageFilter { private: // IPC::MessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void OnFilterAdded(IPC::Sender* sender) OVERRIDE; - virtual void OnFilterRemoved() OVERRIDE; - virtual void OnChannelClosing() OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; + virtual void OnFilterAdded(IPC::Sender* sender) override; + virtual void OnFilterRemoved() override; + virtual void OnChannelClosing() override; void CreateLoggingHandler(); diff --git a/chrome/renderer/net/net_error_helper.h b/chrome/renderer/net/net_error_helper.h index 742f2cd..80cc91d 100644 --- a/chrome/renderer/net/net_error_helper.h +++ b/chrome/renderer/net/net_error_helper.h @@ -46,18 +46,18 @@ class NetErrorHelper void MoreButtonPressed(); // RenderFrameObserver implementation. - virtual void DidStartProvisionalLoad() OVERRIDE; - virtual void DidCommitProvisionalLoad(bool is_new_navigation) OVERRIDE; - virtual void DidFinishLoad() OVERRIDE; - virtual void OnStop() OVERRIDE; - virtual void WasShown() OVERRIDE; - virtual void WasHidden() OVERRIDE; + virtual void DidStartProvisionalLoad() override; + virtual void DidCommitProvisionalLoad(bool is_new_navigation) override; + virtual void DidFinishLoad() override; + virtual void OnStop() override; + virtual void WasShown() override; + virtual void WasHidden() override; // IPC::Listener implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; // RenderProcessObserver implementation. - virtual void NetworkStateChanged(bool online) OVERRIDE; + virtual void NetworkStateChanged(bool online) override; // Examines |frame| and |error| to see if this is an error worthy of a DNS // probe. If it is, initializes |error_strings| based on |error|, @@ -87,21 +87,21 @@ class NetErrorHelper scoped_ptr<LocalizedError::ErrorPageParams> params, bool* reload_button_shown, bool* load_stale_button_shown, - std::string* html) const OVERRIDE; + std::string* html) const override; virtual void LoadErrorPageInMainFrame(const std::string& html, - const GURL& failed_url) OVERRIDE; - virtual void EnablePageHelperFunctions() OVERRIDE; + const GURL& failed_url) override; + virtual void EnablePageHelperFunctions() override; virtual void UpdateErrorPage(const blink::WebURLError& error, - bool is_failed_post) OVERRIDE; + bool is_failed_post) override; virtual void FetchNavigationCorrections( const GURL& navigation_correction_url, - const std::string& navigation_correction_request_body) OVERRIDE; - virtual void CancelFetchNavigationCorrections() OVERRIDE; + const std::string& navigation_correction_request_body) override; + virtual void CancelFetchNavigationCorrections() override; virtual void SendTrackingRequest( const GURL& tracking_url, - const std::string& tracking_request_body) OVERRIDE; - virtual void ReloadPage() OVERRIDE; - virtual void LoadPageFromCache(const GURL& page_url) OVERRIDE; + const std::string& tracking_request_body) override; + virtual void ReloadPage() override; + virtual void LoadPageFromCache(const GURL& page_url) override; void OnNetErrorInfo(int status); void OnSetNavigationCorrectionInfo(const GURL& navigation_correction_url, diff --git a/chrome/renderer/net/net_error_helper_core_unittest.cc b/chrome/renderer/net/net_error_helper_core_unittest.cc index 3ff1dee..4ab2349 100644 --- a/chrome/renderer/net/net_error_helper_core_unittest.cc +++ b/chrome/renderer/net/net_error_helper_core_unittest.cc @@ -161,7 +161,7 @@ class NetErrorHelperCoreTest : public testing::Test, EXPECT_FALSE(is_url_being_fetched()); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { base::StatisticsRecorder::Initialize(); } @@ -299,7 +299,7 @@ class NetErrorHelperCoreTest : public testing::Test, scoped_ptr<LocalizedError::ErrorPageParams> params, bool* reload_button_shown, bool* load_stale_button_shown, - std::string* html) const OVERRIDE { + std::string* html) const override { last_error_page_params_.reset(params.release()); *reload_button_shown = false; *load_stale_button_shown = false; @@ -307,17 +307,17 @@ class NetErrorHelperCoreTest : public testing::Test, } virtual void LoadErrorPageInMainFrame(const std::string& html, - const GURL& failed_url) OVERRIDE { + const GURL& failed_url) override { error_html_update_count_++; last_error_html_ = html; } - virtual void EnablePageHelperFunctions() OVERRIDE { + virtual void EnablePageHelperFunctions() override { enable_page_helper_functions_count_++; } virtual void UpdateErrorPage(const WebURLError& error, - bool is_failed_post) OVERRIDE { + bool is_failed_post) override { update_count_++; last_error_page_params_.reset(NULL); last_error_html_ = ErrorToString(error, is_failed_post); @@ -325,7 +325,7 @@ class NetErrorHelperCoreTest : public testing::Test, virtual void FetchNavigationCorrections( const GURL& navigation_correction_url, - const std::string& navigation_correction_request_body) OVERRIDE { + const std::string& navigation_correction_request_body) override { EXPECT_TRUE(url_being_fetched_.is_empty()); EXPECT_TRUE(request_body_.empty()); EXPECT_EQ(GURL(kNavigationCorrectionUrl), navigation_correction_url); @@ -348,23 +348,23 @@ class NetErrorHelperCoreTest : public testing::Test, EXPECT_TRUE(StringValueEquals(*dict, "params.key", kApiKey)); } - virtual void CancelFetchNavigationCorrections() OVERRIDE { + virtual void CancelFetchNavigationCorrections() override { url_being_fetched_ = GURL(); request_body_.clear(); } - virtual void ReloadPage() OVERRIDE { + virtual void ReloadPage() override { reload_count_++; } - virtual void LoadPageFromCache(const GURL& error_url) OVERRIDE { + virtual void LoadPageFromCache(const GURL& error_url) override { load_stale_count_++; load_stale_url_ = error_url; } virtual void SendTrackingRequest( const GURL& tracking_url, - const std::string& tracking_request_body) OVERRIDE { + const std::string& tracking_request_body) override { last_tracking_url_ = tracking_url; last_tracking_request_body_ = tracking_request_body; tracking_request_count_++; @@ -2233,7 +2233,7 @@ TEST_F(NetErrorHelperCoreAutoReloadTest, ShownWhileNotReloading) { class NetErrorHelperCoreHistogramTest : public NetErrorHelperCoreAutoReloadTest { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { NetErrorHelperCoreAutoReloadTest::SetUp(); } diff --git a/chrome/renderer/net/net_error_page_controller.h b/chrome/renderer/net/net_error_page_controller.h index 9be5bf4..f775382 100644 --- a/chrome/renderer/net/net_error_page_controller.h +++ b/chrome/renderer/net/net_error_page_controller.h @@ -45,12 +45,12 @@ class NetErrorPageController // gin::WrappableBase virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder( - v8::Isolate* isolate) OVERRIDE; + v8::Isolate* isolate) override; // RenderFrameObserver. Overridden to avoid being destroyed when RenderFrame // goes away; NetErrorPageController objects are owned by the JS // garbage collector. - virtual void OnDestruct() OVERRIDE; + virtual void OnDestruct() override; DISALLOW_COPY_AND_ASSIGN(NetErrorPageController); }; diff --git a/chrome/renderer/net/prescient_networking_dispatcher.h b/chrome/renderer/net/prescient_networking_dispatcher.h index e9fe96f..94e811f 100644 --- a/chrome/renderer/net/prescient_networking_dispatcher.h +++ b/chrome/renderer/net/prescient_networking_dispatcher.h @@ -14,7 +14,7 @@ class PrescientNetworkingDispatcher : public blink::WebPrescientNetworking { PrescientNetworkingDispatcher(); virtual ~PrescientNetworkingDispatcher(); - virtual void prefetchDNS(const blink::WebString& hostname) OVERRIDE; + virtual void prefetchDNS(const blink::WebString& hostname) override; private: RendererNetPredictor net_predictor_; diff --git a/chrome/renderer/net_benchmarking_extension.cc b/chrome/renderer/net_benchmarking_extension.cc index 2a5f128..61abbff 100644 --- a/chrome/renderer/net_benchmarking_extension.cc +++ b/chrome/renderer/net_benchmarking_extension.cc @@ -45,7 +45,7 @@ class NetBenchmarkingWrapper : public v8::Extension { virtual v8::Handle<v8::FunctionTemplate> GetNativeFunctionTemplate( v8::Isolate* isolate, - v8::Handle<v8::String> name) OVERRIDE { + v8::Handle<v8::String> name) override { if (name->Equals(v8::String::NewFromUtf8(isolate, "ClearCache"))) { return v8::FunctionTemplate::New(isolate, ClearCache); } else if (name->Equals(v8::String::NewFromUtf8( diff --git a/chrome/renderer/page_load_histograms.h b/chrome/renderer/page_load_histograms.h index b4f1a48..6dd5f59 100644 --- a/chrome/renderer/page_load_histograms.h +++ b/chrome/renderer/page_load_histograms.h @@ -18,8 +18,8 @@ class PageLoadHistograms : public content::RenderViewObserver { private: // RenderViewObserver implementation. - virtual void FrameWillClose(blink::WebFrame* frame) OVERRIDE; - virtual void ClosePage() OVERRIDE; + virtual void FrameWillClose(blink::WebFrame* frame) override; + virtual void ClosePage() override; // Dump all page load histograms appropriate for the given frame. // diff --git a/chrome/renderer/pepper/chrome_pdf_print_client.h b/chrome/renderer/pepper/chrome_pdf_print_client.h index feb84a6..054e4be 100644 --- a/chrome/renderer/pepper/chrome_pdf_print_client.h +++ b/chrome/renderer/pepper/chrome_pdf_print_client.h @@ -15,8 +15,8 @@ class ChromePDFPrintClient : public pdf::PPB_PDF_Impl::PrintClient { private: // pdf::PPB_PDF_Impl::PrintClient: - virtual bool IsPrintingEnabled(PP_Instance instance_id) OVERRIDE; - virtual bool Print(PP_Instance instance_id) OVERRIDE; + virtual bool IsPrintingEnabled(PP_Instance instance_id) override; + virtual bool Print(PP_Instance instance_id) override; DISALLOW_COPY_AND_ASSIGN(ChromePDFPrintClient); }; diff --git a/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h b/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h index 03adf48..228e572 100644 --- a/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h +++ b/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h @@ -23,7 +23,7 @@ class ChromeRendererPepperHostFactory : public ppapi::host::HostFactory { ppapi::host::PpapiHost* host, const ppapi::proxy::ResourceMessageCallParams& params, PP_Instance instance, - const IPC::Message& message) OVERRIDE; + const IPC::Message& message) override; private: // Not owned by this object. diff --git a/chrome/renderer/pepper/pepper_flash_drm_renderer_host.h b/chrome/renderer/pepper/pepper_flash_drm_renderer_host.h index bdb17c1..b5215b8 100644 --- a/chrome/renderer/pepper/pepper_flash_drm_renderer_host.h +++ b/chrome/renderer/pepper/pepper_flash_drm_renderer_host.h @@ -29,7 +29,7 @@ class PepperFlashDRMRendererHost : public ppapi::host::ResourceHost { virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; private: int32_t OnGetVoucherFile(ppapi::host::HostMessageContext* context); diff --git a/chrome/renderer/pepper/pepper_flash_font_file_host.h b/chrome/renderer/pepper/pepper_flash_font_file_host.h index d6b7000..9fd4917 100644 --- a/chrome/renderer/pepper/pepper_flash_font_file_host.h +++ b/chrome/renderer/pepper/pepper_flash_font_file_host.h @@ -36,7 +36,7 @@ class PepperFlashFontFileHost : public ppapi::host::ResourceHost { virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; private: int32_t OnGetFontTable(ppapi::host::HostMessageContext* context, diff --git a/chrome/renderer/pepper/pepper_flash_fullscreen_host.h b/chrome/renderer/pepper/pepper_flash_fullscreen_host.h index 8d3f0d49..e8ed2ce 100644 --- a/chrome/renderer/pepper/pepper_flash_fullscreen_host.h +++ b/chrome/renderer/pepper/pepper_flash_fullscreen_host.h @@ -22,7 +22,7 @@ class PepperFlashFullscreenHost : public ppapi::host::ResourceHost { virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; private: int32_t OnSetFullscreen(ppapi::host::HostMessageContext* context, diff --git a/chrome/renderer/pepper/pepper_flash_menu_host.h b/chrome/renderer/pepper/pepper_flash_menu_host.h index 9376146..17ba487 100644 --- a/chrome/renderer/pepper/pepper_flash_menu_host.h +++ b/chrome/renderer/pepper/pepper_flash_menu_host.h @@ -35,15 +35,15 @@ class PepperFlashMenuHost : public ppapi::host::ResourceHost, virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; private: int32_t OnHostMsgShow(ppapi::host::HostMessageContext* context, const PP_Point& location); // ContextMenuClient implementation. - virtual void OnMenuAction(int request_id, unsigned action) OVERRIDE; - virtual void OnMenuClosed(int request_id) OVERRIDE; + virtual void OnMenuAction(int request_id, unsigned action) override; + virtual void OnMenuClosed(int request_id) override; void SendMenuReply(int32_t result, int action); diff --git a/chrome/renderer/pepper/pepper_flash_renderer_host.h b/chrome/renderer/pepper/pepper_flash_renderer_host.h index 1d9feb4..552418c 100644 --- a/chrome/renderer/pepper/pepper_flash_renderer_host.h +++ b/chrome/renderer/pepper/pepper_flash_renderer_host.h @@ -39,7 +39,7 @@ class PepperFlashRendererHost : public ppapi::host::ResourceHost { // ppapi::host::ResourceHost override. virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; private: int32_t OnGetProxyForURL(ppapi::host::HostMessageContext* host_context, diff --git a/chrome/renderer/pepper/pepper_helper.h b/chrome/renderer/pepper/pepper_helper.h index 7c12864..2d17d74 100644 --- a/chrome/renderer/pepper/pepper_helper.h +++ b/chrome/renderer/pepper/pepper_helper.h @@ -16,7 +16,7 @@ class PepperHelper : public content::RenderFrameObserver { virtual ~PepperHelper(); // RenderFrameObserver. - virtual void DidCreatePepperPlugin(content::RendererPpapiHost* host) OVERRIDE; + virtual void DidCreatePepperPlugin(content::RendererPpapiHost* host) override; private: DISALLOW_COPY_AND_ASSIGN(PepperHelper); diff --git a/chrome/renderer/pepper/pepper_shared_memory_message_filter.h b/chrome/renderer/pepper/pepper_shared_memory_message_filter.h index 9fb21fb..9c33605 100644 --- a/chrome/renderer/pepper/pepper_shared_memory_message_filter.h +++ b/chrome/renderer/pepper/pepper_shared_memory_message_filter.h @@ -28,7 +28,7 @@ class PepperSharedMemoryMessageFilter virtual ~PepperSharedMemoryMessageFilter(); // InstanceMessageFilter: - virtual bool OnInstanceMessageReceived(const IPC::Message& msg) OVERRIDE; + virtual bool OnInstanceMessageReceived(const IPC::Message& msg) override; bool Send(IPC::Message* msg); diff --git a/chrome/renderer/pepper/pepper_uma_host.h b/chrome/renderer/pepper/pepper_uma_host.h index 8d81cd8..d64ae8e 100644 --- a/chrome/renderer/pepper/pepper_uma_host.h +++ b/chrome/renderer/pepper/pepper_uma_host.h @@ -35,7 +35,7 @@ class PepperUMAHost : public ppapi::host::ResourceHost { // ppapi::host::ResourceMessageHandler implementation. virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; private: bool IsPluginWhitelisted(); diff --git a/chrome/renderer/plugins/chrome_plugin_placeholder.h b/chrome/renderer/plugins/chrome_plugin_placeholder.h index 92a841c..c4ee81c 100644 --- a/chrome/renderer/plugins/chrome_plugin_placeholder.h +++ b/chrome/renderer/plugins/chrome_plugin_placeholder.h @@ -50,24 +50,24 @@ class ChromePluginPlaceholder : public plugins::PluginPlaceholder, virtual ~ChromePluginPlaceholder(); // WebViewPlugin::Delegate (via PluginPlaceholder) method - virtual void BindWebFrame(blink::WebFrame* frame) OVERRIDE; + virtual void BindWebFrame(blink::WebFrame* frame) override; // gin::Wrappable (via PluginPlaceholder) method virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder( - v8::Isolate* isolate) OVERRIDE; + v8::Isolate* isolate) override; // content::RenderViewObserver (via PluginPlaceholder) override: - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; // WebViewPlugin::Delegate (via PluginPlaceholder) methods: - virtual void ShowContextMenu(const blink::WebMouseEvent&) OVERRIDE; + virtual void ShowContextMenu(const blink::WebMouseEvent&) override; // content::RenderProcessObserver methods: - virtual void PluginListChanged() OVERRIDE; + virtual void PluginListChanged() override; // content::ContextMenuClient methods: - virtual void OnMenuAction(int request_id, unsigned action) OVERRIDE; - virtual void OnMenuClosed(int request_id) OVERRIDE; + virtual void OnMenuAction(int request_id, unsigned action) override; + virtual void OnMenuClosed(int request_id) override; // Javascript callback opens chrome://plugins in a new tab. void OpenAboutPluginsCallback(); diff --git a/chrome/renderer/plugins/plugin_uma.cc b/chrome/renderer/plugins/plugin_uma.cc index a7d4735..df26dec 100644 --- a/chrome/renderer/plugins/plugin_uma.cc +++ b/chrome/renderer/plugins/plugin_uma.cc @@ -38,7 +38,7 @@ const char* kShockwaveFlashExtensions[] = {".spl", ".swf"}; class UMASenderImpl : public PluginUMAReporter::UMASender { virtual void SendPluginUMA( PluginUMAReporter::ReportType report_type, - PluginUMAReporter::PluginType plugin_type) OVERRIDE; + PluginUMAReporter::PluginType plugin_type) override; }; void UMASenderImpl::SendPluginUMA(PluginUMAReporter::ReportType report_type, diff --git a/chrome/renderer/prefetch_helper.h b/chrome/renderer/prefetch_helper.h index 2c74e01..a155a85 100644 --- a/chrome/renderer/prefetch_helper.h +++ b/chrome/renderer/prefetch_helper.h @@ -24,13 +24,13 @@ class PrefetchHelper : public content::RenderFrameObserver, // blink::WebURLLoaderClient implementation virtual void didFinishLoading(blink::WebURLLoader* loader, double finishTime, - int64_t totalEncodedDataLength) OVERRIDE; + int64_t totalEncodedDataLength) override; virtual void didFail(blink::WebURLLoader* loader, - const blink::WebURLError& error) OVERRIDE; + const blink::WebURLError& error) override; private: // RenderViewObserver implementation - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; void OnPrefetch(const GURL& url); diff --git a/chrome/renderer/prerender/prerender_dispatcher.h b/chrome/renderer/prerender/prerender_dispatcher.h index 6ac6a44..f55f7c7 100644 --- a/chrome/renderer/prerender/prerender_dispatcher.h +++ b/chrome/renderer/prerender/prerender_dispatcher.h @@ -43,12 +43,12 @@ class PrerenderDispatcher : public content::RenderProcessObserver, void OnPrerenderStop(int prerender_id); // From RenderProcessObserver: - virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnControlMessageReceived(const IPC::Message& message) override; // From WebPrerenderingSupport: - virtual void add(const blink::WebPrerender& prerender) OVERRIDE; - virtual void cancel(const blink::WebPrerender& prerender) OVERRIDE; - virtual void abandon(const blink::WebPrerender& prerender) OVERRIDE; + virtual void add(const blink::WebPrerender& prerender) override; + virtual void cancel(const blink::WebPrerender& prerender) override; + virtual void abandon(const blink::WebPrerender& prerender) override; // From WebKit, prerender elements launched by renderers in our process. std::map<int, blink::WebPrerender> prerenders_; diff --git a/chrome/renderer/prerender/prerender_helper.h b/chrome/renderer/prerender/prerender_helper.h index 6defaab..0ed3337 100644 --- a/chrome/renderer/prerender/prerender_helper.h +++ b/chrome/renderer/prerender/prerender_helper.h @@ -26,7 +26,7 @@ class PrerenderHelper private: // RenderViewObserver implementation - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; void OnSetIsPrerendering(bool is_prerendering); diff --git a/chrome/renderer/prerender/prerender_media_load_deferrer.h b/chrome/renderer/prerender/prerender_media_load_deferrer.h index 11678fc..da04af3 100644 --- a/chrome/renderer/prerender/prerender_media_load_deferrer.h +++ b/chrome/renderer/prerender/prerender_media_load_deferrer.h @@ -22,7 +22,7 @@ class PrerenderMediaLoadDeferrer : public content::RenderFrameObserver { private: // RenderFrameObserver method: - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; void OnSetIsPrerendering(bool is_prerendering); diff --git a/chrome/renderer/prerender/prerenderer_client.h b/chrome/renderer/prerender/prerenderer_client.h index 07a92c5..143feb8 100644 --- a/chrome/renderer/prerender/prerenderer_client.h +++ b/chrome/renderer/prerender/prerenderer_client.h @@ -20,7 +20,7 @@ class PrerendererClient : public content::RenderViewObserver, virtual ~PrerendererClient(); // Implements blink::WebPrerendererClient - virtual void willAddPrerender(blink::WebPrerender* prerender) OVERRIDE; + virtual void willAddPrerender(blink::WebPrerender* prerender) override; }; } // namespace prerender diff --git a/chrome/renderer/principals_extension_bindings.cc b/chrome/renderer/principals_extension_bindings.cc index 33ef1c0..89f52bb 100644 --- a/chrome/renderer/principals_extension_bindings.cc +++ b/chrome/renderer/principals_extension_bindings.cc @@ -25,7 +25,7 @@ class PrincipalsExtensionWrapper : public v8::Extension { // v8::Extension overrides. virtual v8::Handle<v8::FunctionTemplate> GetNativeFunctionTemplate( v8::Isolate* isolate, - v8::Handle<v8::String> name) OVERRIDE; + v8::Handle<v8::String> name) override; static RenderView* GetRenderView(); diff --git a/chrome/renderer/printing/print_web_view_helper.h b/chrome/renderer/printing/print_web_view_helper.h index cfc0c1b..292aac4 100644 --- a/chrome/renderer/printing/print_web_view_helper.h +++ b/chrome/renderer/printing/print_web_view_helper.h @@ -118,11 +118,11 @@ class PrintWebViewHelper }; // RenderViewObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; virtual void PrintPage(blink::WebLocalFrame* frame, - bool user_initiated) OVERRIDE; - virtual void DidStartLoading() OVERRIDE; - virtual void DidStopLoading() OVERRIDE; + bool user_initiated) override; + virtual void DidStartLoading() override; + virtual void DidStopLoading() override; // Message handlers --------------------------------------------------------- #if !defined(DISABLE_BASIC_PRINTING) diff --git a/chrome/renderer/printing/print_web_view_helper_browsertest.cc b/chrome/renderer/printing/print_web_view_helper_browsertest.cc index ba5cc26..e2ff37aa 100644 --- a/chrome/renderer/printing/print_web_view_helper_browsertest.cc +++ b/chrome/renderer/printing/print_web_view_helper_browsertest.cc @@ -110,7 +110,7 @@ class DidPreviewPageListener : public IPC::Listener { explicit DidPreviewPageListener(base::RunLoop* run_loop) : run_loop_(run_loop) {} - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { + virtual bool OnMessageReceived(const IPC::Message& message) override { if (message.type() == PrintHostMsg_MetafileReadyForPrinting::ID || message.type() == PrintHostMsg_PrintPreviewFailed::ID || message.type() == PrintHostMsg_PrintPreviewCancelled::ID) @@ -228,7 +228,7 @@ class PrintWebViewHelperTest : public PrintWebViewHelperTestBase { PrintWebViewHelperTest() {} virtual ~PrintWebViewHelperTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ChromeRenderViewTest::SetUp(); } diff --git a/chrome/renderer/safe_browsing/malware_dom_details.h b/chrome/renderer/safe_browsing/malware_dom_details.h index 620b12f..9bac695 100644 --- a/chrome/renderer/safe_browsing/malware_dom_details.h +++ b/chrome/renderer/safe_browsing/malware_dom_details.h @@ -41,7 +41,7 @@ class MalwareDOMDetails : public content::RenderViewObserver { explicit MalwareDOMDetails(content::RenderView* render_view); // RenderViewObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; void OnGetMalwareDOMDetails(); diff --git a/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc b/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc index 559a4a2..7049b27 100644 --- a/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc +++ b/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc @@ -51,7 +51,7 @@ class PhishingClassifierTest : public InProcessBrowserTest { page_term_login_(features::kPageTerm + std::string("login")) { } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(switches::kSingleProcess); #if defined(OS_WIN) // Don't want to try to create a GPU process. @@ -59,7 +59,7 @@ class PhishingClassifierTest : public InProcessBrowserTest { #endif } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { // Construct a model to test with. We include one feature from each of // the feature extractors, which allows us to verify that they all ran. ClientSideModel model; @@ -105,7 +105,7 @@ class PhishingClassifierTest : public InProcessBrowserTest { clock_)); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { content::RunAllPendingInMessageLoop(); } diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate.h b/chrome/renderer/safe_browsing/phishing_classifier_delegate.h index 213d20a..6a3396b 100644 --- a/chrome/renderer/safe_browsing/phishing_classifier_delegate.h +++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate.h @@ -24,7 +24,7 @@ class PhishingClassifierFilter : public content::RenderProcessObserver { static PhishingClassifierFilter* Create(); virtual ~PhishingClassifierFilter(); - virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnControlMessageReceived(const IPC::Message& message) override; private: PhishingClassifierFilter(); @@ -60,7 +60,7 @@ class PhishingClassifierDelegate : public content::RenderViewObserver { // cancelled. However, if the navigation is within the same page, we // continue running the current classification. virtual void DidCommitProvisionalLoad(blink::WebLocalFrame* frame, - bool is_new_navigation) OVERRIDE; + bool is_new_navigation) override; private: friend class PhishingClassifierDelegateTest; @@ -81,7 +81,7 @@ class PhishingClassifierDelegate : public content::RenderViewObserver { void CancelPendingClassification(CancelClassificationReason reason); // RenderViewObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; // Called by the RenderView when it receives a StartPhishingDetection IPC // from the browser. This signals that it is ok to begin classification diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc index 49c8ee7..7a23010 100644 --- a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc +++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc @@ -87,7 +87,7 @@ class InterceptingMessageFilter : public content::BrowserMessageFilter { } const ClientPhishingRequest* verdict() const { return verdict_.get(); } - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { + virtual bool OnMessageReceived(const IPC::Message& message) override { bool handled = true; IPC_BEGIN_MESSAGE_MAP(InterceptingMessageFilter, message) IPC_MESSAGE_HANDLER(SafeBrowsingHostMsg_PhishingDetectionDone, @@ -141,7 +141,7 @@ class PhishingClassifierDelegateTest : public InProcessBrowserTest { } protected: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(switches::kSingleProcess); #if defined(OS_WIN) // Don't want to try to create a GPU process. @@ -149,7 +149,7 @@ class PhishingClassifierDelegateTest : public InProcessBrowserTest { #endif } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { intercepting_filter_ = new InterceptingMessageFilter(); content::RenderView* render_view = content::RenderView::FromRoutingID(kRenderViewRoutingId); diff --git a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc index a7b5bbf..2db88af 100644 --- a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc +++ b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc @@ -73,7 +73,7 @@ class PhishingDOMFeatureExtractorTest : public InProcessBrowserTest { virtual ~PhishingDOMFeatureExtractorTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(switches::kSingleProcess); #if defined(OS_WIN) // Don't want to try to create a GPU process. @@ -81,7 +81,7 @@ class PhishingDOMFeatureExtractorTest : public InProcessBrowserTest { #endif } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { extractor_.reset(new PhishingDOMFeatureExtractor( content::RenderView::FromRoutingID(kRenderViewRoutingId), &clock_)); diff --git a/chrome/renderer/searchbox/search_bouncer.h b/chrome/renderer/searchbox/search_bouncer.h index ba19889..9a64268 100644 --- a/chrome/renderer/searchbox/search_bouncer.h +++ b/chrome/renderer/searchbox/search_bouncer.h @@ -37,7 +37,7 @@ class SearchBouncer : public content::RenderProcessObserver { FRIEND_TEST_ALL_PREFIXES(SearchBouncerTest, SetSearchURLs); // From RenderProcessObserver: - virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnControlMessageReceived(const IPC::Message& message) override; // URLs to bounce back to the browser. std::vector<GURL> search_urls_; diff --git a/chrome/renderer/searchbox/searchbox.h b/chrome/renderer/searchbox/searchbox.h index fd146a0..80c1a6e 100644 --- a/chrome/renderer/searchbox/searchbox.h +++ b/chrome/renderer/searchbox/searchbox.h @@ -114,7 +114,7 @@ class SearchBox : public content::RenderViewObserver, private: // Overridden from content::RenderViewObserver: - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; void OnSetPageSequenceNumber(int page_seq_no); void OnChromeIdentityCheckResult(const base::string16& identity, diff --git a/chrome/renderer/searchbox/searchbox_extension.cc b/chrome/renderer/searchbox/searchbox_extension.cc index 0af04e7..865f097 100644 --- a/chrome/renderer/searchbox/searchbox_extension.cc +++ b/chrome/renderer/searchbox/searchbox_extension.cc @@ -343,7 +343,7 @@ class SearchBoxExtensionWrapper : public v8::Extension { // in this class for window.chrome. virtual v8::Handle<v8::FunctionTemplate> GetNativeFunctionTemplate( v8::Isolate*, - v8::Handle<v8::String> name) OVERRIDE; + v8::Handle<v8::String> name) override; // Helper function to find the RenderView. May return NULL. static content::RenderView* GetRenderView(); diff --git a/chrome/renderer/security_filter_peer.h b/chrome/renderer/security_filter_peer.h index 792fba4..e99f951 100644 --- a/chrome/renderer/security_filter_peer.h +++ b/chrome/renderer/security_filter_peer.h @@ -30,22 +30,22 @@ class SecurityFilterPeer : public content::RequestPeer { int os_error); // content::RequestPeer methods. - virtual void OnUploadProgress(uint64 position, uint64 size) OVERRIDE; + virtual void OnUploadProgress(uint64 position, uint64 size) override; virtual bool OnReceivedRedirect( const net::RedirectInfo& redirect_info, - const content::ResourceResponseInfo& info) OVERRIDE; + const content::ResourceResponseInfo& info) override; virtual void OnReceivedResponse( - const content::ResourceResponseInfo& info) OVERRIDE; - virtual void OnDownloadedData(int len, int encoded_data_length) OVERRIDE {} + const content::ResourceResponseInfo& info) override; + virtual void OnDownloadedData(int len, int encoded_data_length) override {} virtual void OnReceivedData(const char* data, int data_length, - int encoded_data_length) OVERRIDE; + int encoded_data_length) override; virtual void OnCompletedRequest(int error_code, bool was_ignored_by_handler, bool stale_copy_in_cache, const std::string& security_info, const base::TimeTicks& completion_time, - int64 total_transfer_size) OVERRIDE; + int64 total_transfer_size) override; protected: explicit SecurityFilterPeer(content::RequestPeer* peer); @@ -65,17 +65,17 @@ class BufferedPeer : public SecurityFilterPeer { // content::RequestPeer Implementation. virtual void OnReceivedResponse( - const content::ResourceResponseInfo& info) OVERRIDE; + const content::ResourceResponseInfo& info) override; virtual void OnReceivedData(const char* data, int data_length, - int encoded_data_length) OVERRIDE; + int encoded_data_length) override; virtual void OnCompletedRequest( int error_code, bool was_ignored_by_handler, bool stale_copy_in_cache, const std::string& security_info, const base::TimeTicks& completion_time, - int64 total_transfer_size) OVERRIDE; + int64 total_transfer_size) override; protected: // Invoked when the entire request has been processed before the data is sent @@ -108,17 +108,17 @@ class ReplaceContentPeer : public SecurityFilterPeer { // content::RequestPeer Implementation. virtual void OnReceivedResponse( - const content::ResourceResponseInfo& info) OVERRIDE; + const content::ResourceResponseInfo& info) override; virtual void OnReceivedData(const char* data, int data_length, - int encoded_data_length) OVERRIDE; + int encoded_data_length) override; virtual void OnCompletedRequest( int error_code, bool was_ignored_by_handler, bool stale_copy_in_cache, const std::string& security_info, const base::TimeTicks& completion_time, - int64 total_transfer_size) OVERRIDE; + int64 total_transfer_size) override; private: content::ResourceResponseInfo response_info_; diff --git a/chrome/renderer/spellchecker/cocoa_spelling_engine_mac.h b/chrome/renderer/spellchecker/cocoa_spelling_engine_mac.h index a0f01e2..8e087e4 100644 --- a/chrome/renderer/spellchecker/cocoa_spelling_engine_mac.h +++ b/chrome/renderer/spellchecker/cocoa_spelling_engine_mac.h @@ -10,14 +10,14 @@ class CocoaSpellingEngine : public SpellingEngine { public: - virtual void Init(base::File bdict_file) OVERRIDE; - virtual bool InitializeIfNeeded() OVERRIDE; - virtual bool IsEnabled() OVERRIDE; + virtual void Init(base::File bdict_file) override; + virtual bool InitializeIfNeeded() override; + virtual bool IsEnabled() override; virtual bool CheckSpelling(const base::string16& word_to_check, - int tag) OVERRIDE; + int tag) override; virtual void FillSuggestionList( const base::string16& wrong_word, - std::vector<base::string16>* optional_suggestions) OVERRIDE; + std::vector<base::string16>* optional_suggestions) override; }; #endif // CHROME_RENDERER_SPELLCHECKER_NSSPELLCHECKER_ENGINE_H_ diff --git a/chrome/renderer/spellchecker/hunspell_engine.h b/chrome/renderer/spellchecker/hunspell_engine.h index 534eb87..4329283 100644 --- a/chrome/renderer/spellchecker/hunspell_engine.h +++ b/chrome/renderer/spellchecker/hunspell_engine.h @@ -25,15 +25,15 @@ class HunspellEngine : public SpellingEngine { HunspellEngine(); virtual ~HunspellEngine(); - virtual void Init(base::File file) OVERRIDE; + virtual void Init(base::File file) override; - virtual bool InitializeIfNeeded() OVERRIDE; - virtual bool IsEnabled() OVERRIDE; + virtual bool InitializeIfNeeded() override; + virtual bool IsEnabled() override; virtual bool CheckSpelling(const base::string16& word_to_check, - int tag) OVERRIDE; + int tag) override; virtual void FillSuggestionList( const base::string16& wrong_word, - std::vector<base::string16>* optional_suggestions) OVERRIDE; + std::vector<base::string16>* optional_suggestions) override; private: // Initializes the Hunspell dictionary, or does nothing if |hunspell_| is diff --git a/chrome/renderer/spellchecker/spellcheck.cc b/chrome/renderer/spellchecker/spellcheck.cc index f1de849..93a5b08 100644 --- a/chrome/renderer/spellchecker/spellcheck.cc +++ b/chrome/renderer/spellchecker/spellcheck.cc @@ -31,7 +31,7 @@ namespace { class UpdateSpellcheckEnabled : public content::RenderViewVisitor { public: explicit UpdateSpellcheckEnabled(bool enabled) : enabled_(enabled) {} - virtual bool Visit(content::RenderView* render_view) OVERRIDE; + virtual bool Visit(content::RenderView* render_view) override; private: bool enabled_; // New spellcheck-enabled state. @@ -50,7 +50,7 @@ class DocumentMarkersCollector : public content::RenderViewVisitor { DocumentMarkersCollector() {} virtual ~DocumentMarkersCollector() {} const std::vector<uint32>& markers() const { return markers_; } - virtual bool Visit(content::RenderView* render_view) OVERRIDE; + virtual bool Visit(content::RenderView* render_view) override; private: std::vector<uint32> markers_; @@ -71,8 +71,8 @@ bool DocumentMarkersCollector::Visit(content::RenderView* render_view) { class DocumentMarkersRemover : public content::RenderViewVisitor { public: explicit DocumentMarkersRemover(const std::vector<std::string>& words); - virtual ~DocumentMarkersRemover() OVERRIDE {} - virtual bool Visit(content::RenderView* render_view) OVERRIDE; + virtual ~DocumentMarkersRemover() override {} + virtual bool Visit(content::RenderView* render_view) override; private: WebVector<WebString> words_; diff --git a/chrome/renderer/spellchecker/spellcheck.h b/chrome/renderer/spellchecker/spellcheck.h index 7c74bdb..4c8f980 100644 --- a/chrome/renderer/spellchecker/spellcheck.h +++ b/chrome/renderer/spellchecker/spellcheck.h @@ -115,7 +115,7 @@ class SpellCheck : public content::RenderProcessObserver, RequestSpellCheckMultipleTimesWithoutInitialization); // RenderProcessObserver implementation: - virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnControlMessageReceived(const IPC::Message& message) override; // Message handlers. void OnInit(IPC::PlatformFileForTransit bdict_file, diff --git a/chrome/renderer/spellchecker/spellcheck_provider.h b/chrome/renderer/spellchecker/spellcheck_provider.h index 2ea2d47..2b3ca28 100644 --- a/chrome/renderer/spellchecker/spellcheck_provider.h +++ b/chrome/renderer/spellchecker/spellcheck_provider.h @@ -55,8 +55,8 @@ class SpellCheckProvider void EnableSpellcheck(bool enabled); // RenderViewObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void FocusedNodeChanged(const blink::WebNode& node) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; + virtual void FocusedNodeChanged(const blink::WebNode& node) override; private: friend class TestingSpellCheckProvider; @@ -72,24 +72,24 @@ class SpellCheckProvider const blink::WebString& text, int& offset, int& length, - blink::WebVector<blink::WebString>* optional_suggestions) OVERRIDE; + blink::WebVector<blink::WebString>* optional_suggestions) override; virtual void checkTextOfParagraph( const blink::WebString& text, blink::WebTextCheckingTypeMask mask, - blink::WebVector<blink::WebTextCheckingResult>* results) OVERRIDE; + blink::WebVector<blink::WebTextCheckingResult>* results) override; virtual void requestCheckingOfText( const blink::WebString& text, const blink::WebVector<uint32>& markers, const blink::WebVector<unsigned>& marker_offsets, - blink::WebTextCheckingCompletion* completion) OVERRIDE; + blink::WebTextCheckingCompletion* completion) override; virtual blink::WebString autoCorrectWord( - const blink::WebString& misspelled_word) OVERRIDE; - virtual void showSpellingUI(bool show) OVERRIDE; - virtual bool isShowingSpellingUI() OVERRIDE; + const blink::WebString& misspelled_word) override; + virtual void showSpellingUI(bool show) override; + virtual bool isShowingSpellingUI() override; virtual void updateSpellingUIWithMisspelledWord( - const blink::WebString& word) OVERRIDE; + const blink::WebString& word) override; #if !defined(OS_MACOSX) void OnRespondSpellingService( diff --git a/chrome/renderer/spellchecker/spellcheck_provider_test.h b/chrome/renderer/spellchecker/spellcheck_provider_test.h index a2a1e9c..dabd934 100644 --- a/chrome/renderer/spellchecker/spellcheck_provider_test.h +++ b/chrome/renderer/spellchecker/spellcheck_provider_test.h @@ -26,8 +26,8 @@ class FakeTextCheckingCompletion : public blink::WebTextCheckingCompletion { ~FakeTextCheckingCompletion(); virtual void didFinishCheckingText( - const blink::WebVector<blink::WebTextCheckingResult>& results) OVERRIDE; - virtual void didCancelCheckingText() OVERRIDE; + const blink::WebVector<blink::WebTextCheckingResult>& results) override; + virtual void didCancelCheckingText() override; size_t completion_count_; @@ -40,7 +40,7 @@ class TestingSpellCheckProvider : public SpellCheckProvider { TestingSpellCheckProvider(); virtual ~TestingSpellCheckProvider(); - virtual bool Send(IPC::Message* message) OVERRIDE; + virtual bool Send(IPC::Message* message) override; void OnCallSpellingService(int route_id, int identifier, const base::string16& text, diff --git a/chrome/renderer/spellchecker/spellcheck_unittest.cc b/chrome/renderer/spellchecker/spellcheck_unittest.cc index 5dfbe08..9f41cfe 100644 --- a/chrome/renderer/spellchecker/spellcheck_unittest.cc +++ b/chrome/renderer/spellchecker/spellcheck_unittest.cc @@ -113,12 +113,12 @@ class MockTextCheckingCompletion : public blink::WebTextCheckingCompletion { virtual void didFinishCheckingText( const blink::WebVector<blink::WebTextCheckingResult>& results) - OVERRIDE { + override { completion_count_++; last_results_ = results; } - virtual void didCancelCheckingText() OVERRIDE { + virtual void didCancelCheckingText() override { completion_count_++; } diff --git a/chrome/renderer/translate/translate_helper_browsertest.cc b/chrome/renderer/translate/translate_helper_browsertest.cc index c875857..7e512df 100644 --- a/chrome/renderer/translate/translate_helper_browsertest.cc +++ b/chrome/renderer/translate/translate_helper_browsertest.cc @@ -28,7 +28,7 @@ class TestTranslateHelper : public translate::TranslateHelper { extensions::EXTENSION_GROUP_INTERNAL_TRANSLATE_SCRIPTS, extensions::kExtensionScheme) {} - virtual base::TimeDelta AdjustDelay(int delayInMs) OVERRIDE { + virtual base::TimeDelta AdjustDelay(int delayInMs) override { // Just returns base::TimeDelta() which has initial value 0. // Tasks doesn't need to be delayed in tests. return base::TimeDelta(); @@ -61,12 +61,12 @@ class TranslateHelperBrowserTest : public ChromeRenderViewTest { TranslateHelperBrowserTest() : translate_helper_(NULL) {} protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ChromeRenderViewTest::SetUp(); translate_helper_ = new TestTranslateHelper(view_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { delete translate_helper_; ChromeRenderViewTest::TearDown(); } diff --git a/chrome/renderer/translate/translate_script_browsertest.cc b/chrome/renderer/translate/translate_script_browsertest.cc index 1e35adb..557076a 100644 --- a/chrome/renderer/translate/translate_script_browsertest.cc +++ b/chrome/renderer/translate/translate_script_browsertest.cc @@ -102,11 +102,11 @@ class TranslateScriptBrowserTest : public ChromeRenderViewTest { } private: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ChromeRenderViewTest::SetUp(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { ChromeRenderViewTest::TearDown(); } diff --git a/chrome/renderer/tts_dispatcher.h b/chrome/renderer/tts_dispatcher.h index c46327591..9175e6c 100644 --- a/chrome/renderer/tts_dispatcher.h +++ b/chrome/renderer/tts_dispatcher.h @@ -37,15 +37,15 @@ class TtsDispatcher virtual ~TtsDispatcher(); // RenderProcessObserver override. - virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnControlMessageReceived(const IPC::Message& message) override; // blink::WebSpeechSynthesizer implementation. - virtual void updateVoiceList() OVERRIDE; + virtual void updateVoiceList() override; virtual void speak(const blink::WebSpeechSynthesisUtterance& utterance) - OVERRIDE; - virtual void pause() OVERRIDE; - virtual void resume() OVERRIDE; - virtual void cancel() OVERRIDE; + override; + virtual void pause() override; + virtual void resume() override; + virtual void cancel() override; blink::WebSpeechSynthesisUtterance FindUtterance(int utterance_id); |