summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-03 16:59:41 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-03 16:59:41 +0000
commit65485a8cd398e9ca7f7f9749ca184eaa7e4aacbf (patch)
tree465927459362bed55c64fa5309021aa965bad72a
parentd8a6ca901e27fe58e1385492b0fc0cc8bbccaa10 (diff)
downloadchromium_src-65485a8cd398e9ca7f7f9749ca184eaa7e4aacbf.zip
chromium_src-65485a8cd398e9ca7f7f9749ca184eaa7e4aacbf.tar.gz
chromium_src-65485a8cd398e9ca7f7f9749ca184eaa7e4aacbf.tar.bz2
Clang style fix for r76746.
BUG=none TEST=clang bot. Review URL: http://codereview.chromium.org/6611018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76749 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--remoting/client/plugin/pepper_xmpp_proxy.h10
-rw-r--r--remoting/jingle_glue/iq_request.cc4
-rw-r--r--remoting/jingle_glue/iq_request.h4
3 files changed, 11 insertions, 7 deletions
diff --git a/remoting/client/plugin/pepper_xmpp_proxy.h b/remoting/client/plugin/pepper_xmpp_proxy.h
index 6c6c553..c03bb30 100644
--- a/remoting/client/plugin/pepper_xmpp_proxy.h
+++ b/remoting/client/plugin/pepper_xmpp_proxy.h
@@ -16,13 +16,15 @@ class PepperXmppProxy : public XmppProxy {
MessageLoop* pepper_message_loop);
// Must be run on pepper thread.
- void AttachScriptableObject(ChromotingScriptableObject* scriptable_object);
+ virtual void AttachScriptableObject(
+ ChromotingScriptableObject* scriptable_object);
// Must be run on jingle thread.
- void AttachJavascriptIqRequest(JavascriptIqRequest* javascript_iq_request);
+ virtual void AttachJavascriptIqRequest(
+ JavascriptIqRequest* javascript_iq_request);
- void SendIq(const std::string& iq_request_xml);
- void ReceiveIq(const std::string& iq_response_xml);
+ virtual void SendIq(const std::string& iq_request_xml);
+ virtual void ReceiveIq(const std::string& iq_response_xml);
private:
~PepperXmppProxy();
diff --git a/remoting/jingle_glue/iq_request.cc b/remoting/jingle_glue/iq_request.cc
index 8d53b40..8a456f0 100644
--- a/remoting/jingle_glue/iq_request.cc
+++ b/remoting/jingle_glue/iq_request.cc
@@ -56,6 +56,10 @@ void XmppIqRequest::SendIq(const std::string& type,
xmpp_client_->engine()->SendIq(stanza.get(), this, &cookie_);
}
+void XmppIqRequest::set_callback(ReplyCallback* callback) {
+ callback_.reset(callback);
+}
+
void XmppIqRequest::Unregister() {
if (cookie_) {
// No need to unregister the handler if the client has been destroyed.
diff --git a/remoting/jingle_glue/iq_request.h b/remoting/jingle_glue/iq_request.h
index 3d11034..9017ea2 100644
--- a/remoting/jingle_glue/iq_request.h
+++ b/remoting/jingle_glue/iq_request.h
@@ -112,9 +112,7 @@ class XmppIqRequest : public IqRequest, private buzz::XmppIqHandler {
virtual void SendIq(const std::string& type, const std::string& addressee,
buzz::XmlElement* iq_body);
- virtual void set_callback(ReplyCallback* callback) {
- callback_.reset(callback);
- }
+ virtual void set_callback(ReplyCallback* callback);
private:
FRIEND_TEST_ALL_PREFIXES(IqRequestTest, MakeIqStanza);