Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(97)

Side by Side Diff: webkit/plugins/ppapi/ppb_websocket_impl.h

Issue 8771002: Remove OVERRIDEs from methods inherited from WebKit API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef WEBKIT_PLUGINS_PPAPI_PPB_WEBSOCKET_IMPL_H_ 5 #ifndef WEBKIT_PLUGINS_PPAPI_PPB_WEBSOCKET_IMPL_H_
6 #define WEBKIT_PLUGINS_PPAPI_PPB_WEBSOCKET_IMPL_H_ 6 #define WEBKIT_PLUGINS_PPAPI_PPB_WEBSOCKET_IMPL_H_
7 7
8 #include <queue> 8 #include <queue>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 virtual uint64_t GetBufferedAmount() OVERRIDE; 53 virtual uint64_t GetBufferedAmount() OVERRIDE;
54 virtual uint16_t GetCloseCode() OVERRIDE; 54 virtual uint16_t GetCloseCode() OVERRIDE;
55 virtual PP_Var GetCloseReason() OVERRIDE; 55 virtual PP_Var GetCloseReason() OVERRIDE;
56 virtual PP_Bool GetCloseWasClean() OVERRIDE; 56 virtual PP_Bool GetCloseWasClean() OVERRIDE;
57 virtual PP_Var GetExtensions() OVERRIDE; 57 virtual PP_Var GetExtensions() OVERRIDE;
58 virtual PP_Var GetProtocol() OVERRIDE; 58 virtual PP_Var GetProtocol() OVERRIDE;
59 virtual PP_WebSocketReadyState_Dev GetReadyState() OVERRIDE; 59 virtual PP_WebSocketReadyState_Dev GetReadyState() OVERRIDE;
60 virtual PP_Var GetURL() OVERRIDE; 60 virtual PP_Var GetURL() OVERRIDE;
61 61
62 // WebSocketClient implementation. 62 // WebSocketClient implementation.
63 virtual void didConnect() OVERRIDE; 63 virtual void didConnect();
64 virtual void didReceiveMessage(const WebKit::WebString& message) OVERRIDE; 64 virtual void didReceiveMessage(const WebKit::WebString& message);
65 virtual void didReceiveBinaryData( 65 virtual void didReceiveBinaryData(const WebKit::WebData& binaryData);
66 const WebKit::WebData& binaryData) OVERRIDE; 66 virtual void didReceiveMessageError();
67 virtual void didReceiveMessageError() OVERRIDE;
68 // TODO(toyoshim): Add OVERRIDE after landing WebKit side change.
69 virtual void didUpdateBufferedAmount(unsigned long buffered_amount); 67 virtual void didUpdateBufferedAmount(unsigned long buffered_amount);
70 virtual void didStartClosingHandshake() OVERRIDE; 68 virtual void didStartClosingHandshake();
71 virtual void didClose(unsigned long buffered_amount, 69 virtual void didClose(unsigned long buffered_amount,
72 ClosingHandshakeCompletionStatus status, 70 ClosingHandshakeCompletionStatus status,
73 unsigned short code, 71 unsigned short code,
74 const WebKit::WebString& reason) OVERRIDE; 72 const WebKit::WebString& reason);
75 private: 73 private:
76 int32_t DoReceive(); 74 int32_t DoReceive();
77 75
78 scoped_ptr<WebKit::WebSocket> websocket_; 76 scoped_ptr<WebKit::WebSocket> websocket_;
79 PP_WebSocketReadyState_Dev state_; 77 PP_WebSocketReadyState_Dev state_;
80 78
81 PP_CompletionCallback connect_callback_; 79 PP_CompletionCallback connect_callback_;
82 80
83 PP_CompletionCallback receive_callback_; 81 PP_CompletionCallback receive_callback_;
84 PP_Var* receive_callback_var_; 82 PP_Var* receive_callback_var_;
(...skipping 13 matching lines...) Expand all
98 uint64_t buffered_amount_; 96 uint64_t buffered_amount_;
99 uint64_t buffered_amount_after_close_; 97 uint64_t buffered_amount_after_close_;
100 98
101 DISALLOW_COPY_AND_ASSIGN(PPB_WebSocket_Impl); 99 DISALLOW_COPY_AND_ASSIGN(PPB_WebSocket_Impl);
102 }; 100 };
103 101
104 } // namespace ppapi 102 } // namespace ppapi
105 } // namespace webkit 103 } // namespace webkit
106 104
107 #endif // WEBKIT_PLUGINS_PPAPI_PPB_WEBSOCKET_IMPL_H_ 105 #endif // WEBKIT_PLUGINS_PPAPI_PPB_WEBSOCKET_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698