| Index: content/renderer/render_view_impl.h
|
| diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
|
| index 0b1d512e578b980bd29b5021c21a0c57f5253833..31c38c0c18f9f153792ec845b571f68aa5432e3b 100644
|
| --- a/content/renderer/render_view_impl.h
|
| +++ b/content/renderer/render_view_impl.h
|
| @@ -609,7 +609,7 @@ class CONTENT_EXPORT RenderViewImpl
|
| const WebKit::WebString& title,
|
| WebKit::WebTextDirection direction);
|
| virtual void didChangeIcon(WebKit::WebFrame*,
|
| - WebKit::WebIconURL::Type) OVERRIDE;
|
| + WebKit::WebIconURL::Type);
|
| virtual void didFinishDocumentLoad(WebKit::WebFrame* frame);
|
| virtual void didHandleOnloadEvents(WebKit::WebFrame* frame);
|
| virtual void didFailLoad(WebKit::WebFrame* frame,
|
| @@ -651,8 +651,8 @@ class CONTENT_EXPORT RenderViewImpl
|
| v8::Handle<v8::Context>,
|
| int world_id);
|
| virtual void didChangeScrollOffset(WebKit::WebFrame* frame);
|
| - virtual void willInsertBody(WebKit::WebFrame* frame) OVERRIDE;
|
| - virtual void didFirstVisuallyNonEmptyLayout(WebKit::WebFrame*) OVERRIDE;
|
| + virtual void willInsertBody(WebKit::WebFrame* frame);
|
| + virtual void didFirstVisuallyNonEmptyLayout(WebKit::WebFrame*);
|
| virtual void didChangeContentsSize(WebKit::WebFrame* frame,
|
| const WebKit::WebSize& size);
|
| virtual void reportFindInPageMatchCount(int request_id,
|
| @@ -681,21 +681,21 @@ class CONTENT_EXPORT RenderViewImpl
|
| virtual void willOpenSocketStream(
|
| WebKit::WebSocketStreamHandle* handle);
|
| virtual void willStartUsingPeerConnectionHandler(WebKit::WebFrame* frame,
|
| - WebKit::WebRTCPeerConnectionHandler* handler) OVERRIDE;
|
| + WebKit::WebRTCPeerConnectionHandler* handler);
|
| virtual bool willCheckAndDispatchMessageEvent(
|
| WebKit::WebFrame* sourceFrame,
|
| WebKit::WebFrame* targetFrame,
|
| WebKit::WebSecurityOrigin targetOrigin,
|
| - WebKit::WebDOMMessageEvent event) OVERRIDE;
|
| + WebKit::WebDOMMessageEvent event);
|
| virtual WebKit::WebString acceptLanguages() OVERRIDE;
|
| virtual WebKit::WebString userAgentOverride(
|
| WebKit::WebFrame* frame,
|
| - const WebKit::WebURL& url) OVERRIDE;
|
| - virtual WebKit::WebString doNotTrackValue(WebKit::WebFrame* frame) OVERRIDE;
|
| - virtual bool allowWebGL(WebKit::WebFrame* frame, bool default_value) OVERRIDE;
|
| + const WebKit::WebURL& url);
|
| + virtual WebKit::WebString doNotTrackValue(WebKit::WebFrame* frame);
|
| + virtual bool allowWebGL(WebKit::WebFrame* frame, bool default_value);
|
| virtual void didLoseWebGLContext(
|
| WebKit::WebFrame* frame,
|
| - int arb_robustness_status_code) OVERRIDE;
|
| + int arb_robustness_status_code);
|
|
|
| // WebKit::WebPageSerializerClient implementation ----------------------------
|
|
|
|
|