summaryrefslogtreecommitdiffstats
path: root/extensions/shell/renderer
diff options
context:
space:
mode:
authormostynb <mostynb@opera.com>2014-10-03 09:32:19 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-03 16:32:37 +0000
commit0eac4e1becc07e32503722d9ffd421cf8c8688e3 (patch)
treeb8777ad781ca887318c7760bb7380fd662497558 /extensions/shell/renderer
parentc0fd0633fb72a4e71acaf09f47202c8b8225a015 (diff)
downloadchromium_src-0eac4e1becc07e32503722d9ffd421cf8c8688e3.zip
chromium_src-0eac4e1becc07e32503722d9ffd421cf8c8688e3.tar.gz
chromium_src-0eac4e1becc07e32503722d9ffd421cf8c8688e3.tar.bz2
replace OVERRIDE and FINAL with override and final in extensions/
BUG=417463 Review URL: https://codereview.chromium.org/622343002 Cr-Commit-Position: refs/heads/master@{#298042}
Diffstat (limited to 'extensions/shell/renderer')
-rw-r--r--extensions/shell/renderer/shell_content_renderer_client.cc2
-rw-r--r--extensions/shell/renderer/shell_content_renderer_client.h22
-rw-r--r--extensions/shell/renderer/shell_extensions_renderer_client.h4
3 files changed, 14 insertions, 14 deletions
diff --git a/extensions/shell/renderer/shell_content_renderer_client.cc b/extensions/shell/renderer/shell_content_renderer_client.cc
index 17f8b10f..c650421 100644
--- a/extensions/shell/renderer/shell_content_renderer_client.cc
+++ b/extensions/shell/renderer/shell_content_renderer_client.cc
@@ -43,7 +43,7 @@ class ShellFrameHelper
// RenderFrameObserver implementation.
virtual void WillReleaseScriptContext(v8::Handle<v8::Context>,
- int world_id) OVERRIDE;
+ 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 c040e8e..291af16 100644
--- a/extensions/shell/renderer/shell_content_renderer_client.h
+++ b/extensions/shell/renderer/shell_content_renderer_client.h
@@ -25,32 +25,32 @@ class ShellContentRendererClient : public content::ContentRendererClient {
virtual ~ShellContentRendererClient();
// content::ContentRendererClient implementation:
- virtual void RenderThreadStarted() OVERRIDE;
- virtual void RenderFrameCreated(content::RenderFrame* render_frame) OVERRIDE;
- virtual void RenderViewCreated(content::RenderView* render_view) OVERRIDE;
+ 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;
+ 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 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 const void* CreatePPAPIInterface(
- const std::string& interface_name) OVERRIDE;
- virtual bool IsExternalPepperPlugin(const std::string& module_name) OVERRIDE;
- virtual bool ShouldEnableSiteIsolationPolicy() const OVERRIDE;
+ const std::string& interface_name) override;
+ virtual bool IsExternalPepperPlugin(const std::string& module_name) override;
+ virtual bool ShouldEnableSiteIsolationPolicy() const override;
virtual content::BrowserPluginDelegate* CreateBrowserPluginDelegate(
content::RenderFrame* render_frame,
- const std::string& mime_type) OVERRIDE;
+ const std::string& mime_type) override;
private:
scoped_ptr<ShellExtensionsClient> extensions_client_;
diff --git a/extensions/shell/renderer/shell_extensions_renderer_client.h b/extensions/shell/renderer/shell_extensions_renderer_client.h
index 1bbe3f4..f404756 100644
--- a/extensions/shell/renderer/shell_extensions_renderer_client.h
+++ b/extensions/shell/renderer/shell_extensions_renderer_client.h
@@ -16,8 +16,8 @@ class ShellExtensionsRendererClient : public ExtensionsRendererClient {
virtual ~ShellExtensionsRendererClient();
// 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(ShellExtensionsRendererClient);