Capabilities + Extensions + Cast Host Extension Support for Android client

remoting/client/jni/chromoting_jni_instance.h

Index: remoting/client/jni/chromoting_jni_instance.h
diff --git a/remoting/client/jni/chromoting_jni_instance.h b/remoting/client/jni/chromoting_jni_instance.h
index 8f47ea9300c75a6dab5557073ac9ef5b3cf6c78e..7ed637a00469c85bd6b4bb793399c415baa92bd6 100644
--- a/remoting/client/jni/chromoting_jni_instance.h
+++ b/remoting/client/jni/chromoting_jni_instance.h
@@ -48,7 +48,8 @@ class ChromotingJniInstance
                         const char* host_id,
                         const char* host_pubkey,
                         const char* pairing_id,
-                        const char* pairing_secret);
+                        const char* pairing_secret,
+                        const char* capabilities="");

[Lambros, 2014/08/14 23:54:25]

Chromium style does not allow default parameters.

[aiguha, 2014/08/15 03:37:30]

Acknowledged.

 
   // Terminates the current connection (if it hasn't already failed) and cleans
   // up. Must be called before destruction.
@@ -86,6 +87,8 @@ class ChromotingJniInstance
 
   void SendTextEvent(const std::string& text);
 
+  void SendClientMessage(const std::string& type, const std::string& data);
+
   // Records paint time for statistics logging, if enabled. May be called from
   // any thread.
   void RecordPaintTime(int64 paint_time_ms);
@@ -180,6 +183,11 @@ class ChromotingJniInstance
   // the Android log. Used on the network thread.
   bool stats_logging_enabled_;
 
+  // The set of capabilities supported by the client. Accessed on the network
+  // thread. Once SetCapabilities() is called, this will contain the negotiated
+  // set of capabilities for this remoting session.
+  std::string capabilities_;
+
   friend class base::RefCountedThreadSafe<ChromotingJniInstance>;
 
   base::WeakPtrFactory<ChromotingJniInstance> weak_factory_;