summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authortoyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-02 04:19:20 +0000
committertoyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-02 04:19:20 +0000
commit6c02004be3ca695ba35b3874c64b0db7b7c88f40 (patch)
tree9eda4bc8c7a8b7472a1ad62bb328d56690390458 /webkit
parentf0be863af2b9e997e7ebb025fda1105f6560e765 (diff)
downloadchromium_src-6c02004be3ca695ba35b3874c64b0db7b7c88f40.zip
chromium_src-6c02004be3ca695ba35b3874c64b0db7b7c88f40.tar.gz
chromium_src-6c02004be3ca695ba35b3874c64b0db7b7c88f40.tar.bz2
Remove OVERRIDEs from methods inherited from WebKit API
BUG=105708 TEST=ui_tests --gtest_filter='PPAPITest.WebSocket*' Review URL: http://codereview.chromium.org/8771002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112634 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/plugins/ppapi/ppb_websocket_impl.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/webkit/plugins/ppapi/ppb_websocket_impl.h b/webkit/plugins/ppapi/ppb_websocket_impl.h
index 6204587..ddd3482 100644
--- a/webkit/plugins/ppapi/ppb_websocket_impl.h
+++ b/webkit/plugins/ppapi/ppb_websocket_impl.h
@@ -60,18 +60,16 @@ class PPB_WebSocket_Impl : public ::ppapi::Resource,
virtual PP_Var GetURL() OVERRIDE;
// WebSocketClient implementation.
- virtual void didConnect() OVERRIDE;
- virtual void didReceiveMessage(const WebKit::WebString& message) OVERRIDE;
- virtual void didReceiveBinaryData(
- const WebKit::WebData& binaryData) OVERRIDE;
- virtual void didReceiveMessageError() OVERRIDE;
- // TODO(toyoshim): Add OVERRIDE after landing WebKit side change.
+ virtual void didConnect();
+ virtual void didReceiveMessage(const WebKit::WebString& message);
+ virtual void didReceiveBinaryData(const WebKit::WebData& binaryData);
+ virtual void didReceiveMessageError();
virtual void didUpdateBufferedAmount(unsigned long buffered_amount);
- virtual void didStartClosingHandshake() OVERRIDE;
+ virtual void didStartClosingHandshake();
virtual void didClose(unsigned long buffered_amount,
ClosingHandshakeCompletionStatus status,
unsigned short code,
- const WebKit::WebString& reason) OVERRIDE;
+ const WebKit::WebString& reason);
private:
int32_t DoReceive();