summaryrefslogtreecommitdiffstats
path: root/android_webview/renderer
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2015-02-03 17:50:17 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-04 01:51:54 +0000
commit9f9f934ab10ff8bf1922ccc23e449167237d98b9 (patch)
treeca1b1086273089dbb9ad67add82cff05e8999317 /android_webview/renderer
parente1e2bfadda328e86ee5c9f262e4c96113ffcd9e3 (diff)
downloadchromium_src-9f9f934ab10ff8bf1922ccc23e449167237d98b9.zip
chromium_src-9f9f934ab10ff8bf1922ccc23e449167237d98b9.tar.gz
chromium_src-9f9f934ab10ff8bf1922ccc23e449167237d98b9.tar.bz2
Update {virtual,override,final} to follow C++11 style.
The Google style guide states that only one of {virtual,override,final} should be used for each declaration, since override implies virtual and final implies both virtual and override. This patch was automatically generated with an OS=android build using a variation of https://codereview.chromium.org/598073004. BUG=417463 R=sgurun@chromium.org Review URL: https://codereview.chromium.org/893273003 Cr-Commit-Position: refs/heads/master@{#314467}
Diffstat (limited to 'android_webview/renderer')
-rw-r--r--android_webview/renderer/aw_content_renderer_client.h53
-rw-r--r--android_webview/renderer/aw_message_port_client.h2
-rw-r--r--android_webview/renderer/aw_permission_client.h4
-rw-r--r--android_webview/renderer/aw_render_frame_ext.h4
-rw-r--r--android_webview/renderer/aw_render_process_observer.h6
-rw-r--r--android_webview/renderer/aw_render_view_ext.h12
-rw-r--r--android_webview/renderer/print_render_frame_observer.h4
7 files changed, 41 insertions, 44 deletions
diff --git a/android_webview/renderer/aw_content_renderer_client.h b/android_webview/renderer/aw_content_renderer_client.h
index f6ffcbf..c16b506 100644
--- a/android_webview/renderer/aw_content_renderer_client.h
+++ b/android_webview/renderer/aw_content_renderer_client.h
@@ -19,36 +19,33 @@ namespace android_webview {
class AwContentRendererClient : public content::ContentRendererClient {
public:
AwContentRendererClient();
- virtual ~AwContentRendererClient();
+ ~AwContentRendererClient() override;
// ContentRendererClient implementation.
- virtual void RenderThreadStarted() override;
- virtual void RenderFrameCreated(content::RenderFrame* render_frame) override;
- virtual void RenderViewCreated(content::RenderView* render_view) override;
- virtual bool HasErrorPage(int http_status_code,
- std::string* error_domain) 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;
- virtual unsigned long long VisitedLinkHash(const char* canonical_url,
- size_t length) override;
- virtual bool IsLinkVisited(unsigned long long link_hash) override;
- virtual void AddKeySystems(
- std::vector<media::KeySystemInfo>* key_systems) override;
-
- virtual bool HandleNavigation(content::RenderFrame* render_frame,
- content::DocumentState* document_state,
- int opener_id,
- blink::WebFrame* frame,
- const blink::WebURLRequest& request,
- blink::WebNavigationType type,
- blink::WebNavigationPolicy default_policy,
- bool is_redirect) override;
- virtual bool ShouldOverridePageVisibilityState(
+ void RenderThreadStarted() override;
+ void RenderFrameCreated(content::RenderFrame* render_frame) override;
+ void RenderViewCreated(content::RenderView* render_view) override;
+ bool HasErrorPage(int http_status_code, std::string* error_domain) override;
+ 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;
+ unsigned long long VisitedLinkHash(const char* canonical_url,
+ size_t length) override;
+ bool IsLinkVisited(unsigned long long link_hash) override;
+ void AddKeySystems(std::vector<media::KeySystemInfo>* key_systems) override;
+
+ bool HandleNavigation(content::RenderFrame* render_frame,
+ content::DocumentState* document_state,
+ int opener_id,
+ blink::WebFrame* frame,
+ const blink::WebURLRequest& request,
+ blink::WebNavigationType type,
+ blink::WebNavigationPolicy default_policy,
+ bool is_redirect) override;
+ bool ShouldOverridePageVisibilityState(
const content::RenderFrame* render_frame,
blink::WebPageVisibilityState* override_state) override;
diff --git a/android_webview/renderer/aw_message_port_client.h b/android_webview/renderer/aw_message_port_client.h
index e83641e..bd21472 100644
--- a/android_webview/renderer/aw_message_port_client.h
+++ b/android_webview/renderer/aw_message_port_client.h
@@ -19,7 +19,7 @@ class AwMessagePortClient : public content::RenderFrameObserver {
explicit AwMessagePortClient(content::RenderFrame* render_frame);
private:
- virtual ~AwMessagePortClient();
+ ~AwMessagePortClient() override;
// RenderFrameObserver
bool OnMessageReceived(const IPC::Message& message) override;
diff --git a/android_webview/renderer/aw_permission_client.h b/android_webview/renderer/aw_permission_client.h
index e3a4bfa..e5c036d 100644
--- a/android_webview/renderer/aw_permission_client.h
+++ b/android_webview/renderer/aw_permission_client.h
@@ -16,8 +16,8 @@ class AwPermissionClient : public content::RenderFrameObserver,
public:
explicit AwPermissionClient(content::RenderFrame* render_view);
- private:
- virtual ~AwPermissionClient();
+ private:
+ ~AwPermissionClient() override;
// blink::WebPermissionClient implementation.
virtual bool allowDisplayingInsecureContent(
diff --git a/android_webview/renderer/aw_render_frame_ext.h b/android_webview/renderer/aw_render_frame_ext.h
index 40141bc..0643f7f 100644
--- a/android_webview/renderer/aw_render_frame_ext.h
+++ b/android_webview/renderer/aw_render_frame_ext.h
@@ -17,10 +17,10 @@ class AwRenderFrameExt : public content::RenderFrameObserver {
AwRenderFrameExt(content::RenderFrame* render_frame);
private:
- virtual ~AwRenderFrameExt();
+ ~AwRenderFrameExt() override;
// RenderFrame::Observer:
- virtual void DidCommitProvisionalLoad(bool is_new_navigation) override;
+ void DidCommitProvisionalLoad(bool is_new_navigation) override;
DISALLOW_COPY_AND_ASSIGN(AwRenderFrameExt);
};
diff --git a/android_webview/renderer/aw_render_process_observer.h b/android_webview/renderer/aw_render_process_observer.h
index 5c39787..b2df85d 100644
--- a/android_webview/renderer/aw_render_process_observer.h
+++ b/android_webview/renderer/aw_render_process_observer.h
@@ -16,11 +16,11 @@ namespace android_webview {
class AwRenderProcessObserver : public content::RenderProcessObserver {
public:
AwRenderProcessObserver();
- virtual ~AwRenderProcessObserver();
+ ~AwRenderProcessObserver() override;
// content::RenderProcessObserver implementation.
- virtual bool OnControlMessageReceived(const IPC::Message& message) override;
- virtual void WebKitInitialized() override;
+ bool OnControlMessageReceived(const IPC::Message& message) override;
+ void WebKitInitialized() override;
private:
void OnClearCache();
diff --git a/android_webview/renderer/aw_render_view_ext.h b/android_webview/renderer/aw_render_view_ext.h
index 29f6442..58db3d8 100644
--- a/android_webview/renderer/aw_render_view_ext.h
+++ b/android_webview/renderer/aw_render_view_ext.h
@@ -32,14 +32,14 @@ class AwRenderViewExt : public content::RenderViewObserver {
private:
AwRenderViewExt(content::RenderView* render_view);
- virtual ~AwRenderViewExt();
+ ~AwRenderViewExt() override;
// RenderView::Observer:
- virtual bool OnMessageReceived(const IPC::Message& message) override;
- virtual void FocusedNodeChanged(const blink::WebNode& node) override;
- virtual void DidCommitCompositorFrame() override;
- virtual void DidUpdateLayout() override;
- virtual void Navigate(const GURL& url) override;
+ bool OnMessageReceived(const IPC::Message& message) override;
+ void FocusedNodeChanged(const blink::WebNode& node) override;
+ void DidCommitCompositorFrame() override;
+ void DidUpdateLayout() override;
+ void Navigate(const GURL& url) override;
void OnDocumentHasImagesRequest(int id);
diff --git a/android_webview/renderer/print_render_frame_observer.h b/android_webview/renderer/print_render_frame_observer.h
index 95248ac..1b99c38 100644
--- a/android_webview/renderer/print_render_frame_observer.h
+++ b/android_webview/renderer/print_render_frame_observer.h
@@ -14,10 +14,10 @@ class PrintRenderFrameObserver : public content::RenderFrameObserver {
explicit PrintRenderFrameObserver(content::RenderFrame* render_view);
private:
- virtual ~PrintRenderFrameObserver();
+ ~PrintRenderFrameObserver() override;
// RenderFrameObserver implementation.
- virtual bool OnMessageReceived(const IPC::Message& message) override;
+ bool OnMessageReceived(const IPC::Message& message) override;
// IPC handlers
void OnPrintNodeUnderContextMenu();