diff options
author | dcheng <dcheng@chromium.org> | 2014-10-27 14:48:33 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-27 21:48:55 +0000 |
commit | 578ab408a9a10b59297b8364a50987a8dd088cdf (patch) | |
tree | 157fdfba308a708c7a1b2c62e5599aac8243003e /extensions/shell/renderer | |
parent | 67be2b1f8dbb8fe664365ce33cd6ccf2832e0663 (diff) | |
download | chromium_src-578ab408a9a10b59297b8364a50987a8dd088cdf.zip chromium_src-578ab408a9a10b59297b8364a50987a8dd088cdf.tar.gz chromium_src-578ab408a9a10b59297b8364a50987a8dd088cdf.tar.bz2 |
Standardize usage of virtual/override/final specifiers.
The Google C++ style guide states:
Explicitly annotate overrides of virtual functions or virtual
destructors with an override or (less frequently) final specifier.
Older (pre-C++11) code will use the virtual keyword as an inferior
alternative annotation. For clarity, use exactly one of override,
final, or virtual when declaring an override.
To better conform to these guidelines, the following constructs have
been rewritten:
- if a base class has a virtual destructor, then:
virtual ~Foo(); -> ~Foo() override;
- virtual void Foo() override; -> void Foo() override;
- virtual void Foo() override final; -> void Foo() final;
This patch was automatically generated. The clang plugin can generate
fixit hints, which are suggested edits when it is 100% sure it knows how
to fix a problem. The hints from the clang plugin were applied to the
source tree using the tool in https://codereview.chromium.org/598073004.
BUG=417463
R=yoz@chromium.org
Review URL: https://codereview.chromium.org/667153007
Cr-Commit-Position: refs/heads/master@{#301453}
Diffstat (limited to 'extensions/shell/renderer')
3 files changed, 27 insertions, 29 deletions
diff --git a/extensions/shell/renderer/shell_content_renderer_client.cc b/extensions/shell/renderer/shell_content_renderer_client.cc index c650421..487731d 100644 --- a/extensions/shell/renderer/shell_content_renderer_client.cc +++ b/extensions/shell/renderer/shell_content_renderer_client.cc @@ -39,11 +39,10 @@ class ShellFrameHelper public: ShellFrameHelper(content::RenderFrame* render_frame, Dispatcher* extension_dispatcher); - virtual ~ShellFrameHelper(); + ~ShellFrameHelper() override; // RenderFrameObserver implementation. - virtual void WillReleaseScriptContext(v8::Handle<v8::Context>, - int world_id) override; + void WillReleaseScriptContext(v8::Handle<v8::Context>, int world_id) override; private: Dispatcher* extension_dispatcher_; diff --git a/extensions/shell/renderer/shell_content_renderer_client.h b/extensions/shell/renderer/shell_content_renderer_client.h index 291af16..a4df9ca 100644 --- a/extensions/shell/renderer/shell_content_renderer_client.h +++ b/extensions/shell/renderer/shell_content_renderer_client.h @@ -22,33 +22,32 @@ class ShellRendererMainDelegate; class ShellContentRendererClient : public content::ContentRendererClient { public: ShellContentRendererClient(); - virtual ~ShellContentRendererClient(); + ~ShellContentRendererClient() override; // content::ContentRendererClient implementation: - virtual void RenderThreadStarted() override; - virtual void RenderFrameCreated(content::RenderFrame* render_frame) override; - virtual void RenderViewCreated(content::RenderView* render_view) override; - virtual bool OverrideCreatePlugin(content::RenderFrame* render_frame, - blink::WebLocalFrame* frame, - const blink::WebPluginParams& params, - blink::WebPlugin** plugin) override; - virtual blink::WebPlugin* CreatePluginReplacement( + void RenderThreadStarted() override; + void RenderFrameCreated(content::RenderFrame* render_frame) override; + void RenderViewCreated(content::RenderView* render_view) override; + bool OverrideCreatePlugin(content::RenderFrame* render_frame, + blink::WebLocalFrame* frame, + const blink::WebPluginParams& params, + blink::WebPlugin** plugin) override; + blink::WebPlugin* CreatePluginReplacement( content::RenderFrame* render_frame, const base::FilePath& plugin_path) override; - virtual bool WillSendRequest(blink::WebFrame* frame, - ui::PageTransition transition_type, - const GURL& url, - const GURL& first_party_for_cookies, - GURL* new_url) override; - virtual void DidCreateScriptContext(blink::WebFrame* frame, - v8::Handle<v8::Context> context, - int extension_group, - int world_id) override; - virtual const void* CreatePPAPIInterface( - const std::string& interface_name) override; - virtual bool IsExternalPepperPlugin(const std::string& module_name) override; - virtual bool ShouldEnableSiteIsolationPolicy() const override; - virtual content::BrowserPluginDelegate* CreateBrowserPluginDelegate( + bool WillSendRequest(blink::WebFrame* frame, + ui::PageTransition transition_type, + const GURL& url, + const GURL& first_party_for_cookies, + GURL* new_url) override; + void DidCreateScriptContext(blink::WebFrame* frame, + v8::Handle<v8::Context> context, + int extension_group, + int world_id) override; + const void* CreatePPAPIInterface(const std::string& interface_name) override; + bool IsExternalPepperPlugin(const std::string& module_name) override; + bool ShouldEnableSiteIsolationPolicy() const override; + content::BrowserPluginDelegate* CreateBrowserPluginDelegate( content::RenderFrame* render_frame, const std::string& mime_type) override; diff --git a/extensions/shell/renderer/shell_extensions_renderer_client.h b/extensions/shell/renderer/shell_extensions_renderer_client.h index f404756..aa72353 100644 --- a/extensions/shell/renderer/shell_extensions_renderer_client.h +++ b/extensions/shell/renderer/shell_extensions_renderer_client.h @@ -13,11 +13,11 @@ namespace extensions { class ShellExtensionsRendererClient : public ExtensionsRendererClient { public: ShellExtensionsRendererClient(); - virtual ~ShellExtensionsRendererClient(); + ~ShellExtensionsRendererClient() override; // ExtensionsRendererClient implementation. - virtual bool IsIncognitoProcess() const override; - virtual int GetLowestIsolatedWorldId() const override; + bool IsIncognitoProcess() const override; + int GetLowestIsolatedWorldId() const override; private: DISALLOW_COPY_AND_ASSIGN(ShellExtensionsRendererClient); |