diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-19 00:06:02 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-19 00:06:02 +0000 |
| commit | 6a6fe806ed0d0b7bf8104815398c3b1f3d766410 (patch) | |
| tree | 27aab3442983de794d952800f3005d70877a715c /remoting/client | |
| parent | 0f9c4556b26ffb55cea457dfeeec9be2924612d1 (diff) | |
| download | chromium_src-6a6fe806ed0d0b7bf8104815398c3b1f3d766410.zip chromium_src-6a6fe806ed0d0b7bf8104815398c3b1f3d766410.tar.gz chromium_src-6a6fe806ed0d0b7bf8104815398c3b1f3d766410.tar.bz2 | |
Add OVERRIDE to remoting/.
BUG=104314
TEST=no change
Review URL: http://codereview.chromium.org/8601011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110791 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client')
| -rw-r--r-- | remoting/client/plugin/chromoting_scriptable_object.h | 12 | ||||
| -rw-r--r-- | remoting/client/plugin/pepper_input_handler.h | 2 | ||||
| -rw-r--r-- | remoting/client/plugin/pepper_xmpp_proxy.h | 7 |
3 files changed, 11 insertions, 10 deletions
diff --git a/remoting/client/plugin/chromoting_scriptable_object.h b/remoting/client/plugin/chromoting_scriptable_object.h index 235b3e6..1ca45fd 100644 --- a/remoting/client/plugin/chromoting_scriptable_object.h +++ b/remoting/client/plugin/chromoting_scriptable_object.h @@ -145,17 +145,17 @@ class ChromotingScriptableObject virtual void Init(); // Override the ScriptableObject functions. - virtual bool HasProperty(const pp::Var& name, pp::Var* exception); - virtual bool HasMethod(const pp::Var& name, pp::Var* exception); - virtual pp::Var GetProperty(const pp::Var& name, pp::Var* exception); + virtual bool HasProperty(const pp::Var& name, pp::Var* exception) OVERRIDE; + virtual bool HasMethod(const pp::Var& name, pp::Var* exception) OVERRIDE; + virtual pp::Var GetProperty(const pp::Var& name, pp::Var* exception) OVERRIDE; virtual void GetAllPropertyNames(std::vector<pp::Var>* properties, - pp::Var* exception); + pp::Var* exception) OVERRIDE; virtual void SetProperty(const pp::Var& name, const pp::Var& value, - pp::Var* exception); + pp::Var* exception) OVERRIDE; virtual pp::Var Call(const pp::Var& method_name, const std::vector<pp::Var>& args, - pp::Var* exception); + pp::Var* exception) OVERRIDE; void SetConnectionStatus(ConnectionStatus status, ConnectionError error); void LogDebugInfo(const std::string& info); diff --git a/remoting/client/plugin/pepper_input_handler.h b/remoting/client/plugin/pepper_input_handler.h index 22ec759..bc7f2be 100644 --- a/remoting/client/plugin/pepper_input_handler.h +++ b/remoting/client/plugin/pepper_input_handler.h @@ -24,7 +24,7 @@ class PepperInputHandler : public InputHandler { PepperViewProxy* view); virtual ~PepperInputHandler(); - virtual void Initialize(); + virtual void Initialize() OVERRIDE; void HandleKeyEvent(bool keydown, const pp::KeyboardInputEvent& event); void HandleCharacterEvent(const pp::KeyboardInputEvent& event); diff --git a/remoting/client/plugin/pepper_xmpp_proxy.h b/remoting/client/plugin/pepper_xmpp_proxy.h index 189572c..cc3e690 100644 --- a/remoting/client/plugin/pepper_xmpp_proxy.h +++ b/remoting/client/plugin/pepper_xmpp_proxy.h @@ -33,10 +33,11 @@ class PepperXmppProxy : public XmppProxy { // create a WeakPtr on, say the pepper thread, and then pass execution of // this function callback with the weak pointer bound as a parameter. That // will fail because the WeakPtr will have been created on the wrong thread. - virtual void AttachCallback(base::WeakPtr<ResponseCallback> callback); - virtual void DetachCallback(); + virtual void AttachCallback( + base::WeakPtr<ResponseCallback> callback) OVERRIDE; + virtual void DetachCallback() OVERRIDE; - virtual void SendIq(const std::string& request_xml); + virtual void SendIq(const std::string& request_xml) OVERRIDE; virtual void OnIq(const std::string& response_xml); private: |