Various improvements to the Chromoting Android app

remoting/client/jni/chromoting_jni_instance.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef REMOTING_CLIENT_CHROMOTING_JNI_INSTANCE_H_
 #define REMOTING_CLIENT_CHROMOTING_JNI_INSTANCE_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
@@ skipping 19 matching lines @@
 }  // namespace protocol
 
 // ClientUserInterface that indirectly makes and receives JNI calls.
 class ChromotingJniInstance
   : public ClientUserInterface,
     public protocol::ClipboardStub,
     public protocol::CursorShapeStub,
     public base::RefCountedThreadSafe<ChromotingJniInstance> {
  public:
   // Initiates a connection with the specified host. Call from the UI thread.
-  ChromotingJniInstance(
-      const char* username,
-      const char* auth_token,
-      const char* host_jid,
-      const char* host_id,
-      const char* host_pubkey);
+  // The instance does not take ownership of |jni_runtime|.
+  ChromotingJniInstance(ChromotingJniRuntime* jni_runtime,
+                        const char* username,
+                        const char* auth_token,
+                        const char* host_jid,
+                        const char* host_id,
+                        const char* host_pubkey);
 
   // Terminates the current connection (if it hasn't already failed) and cleans
   // up. Must be called before destruction.
   void Cleanup();
 
   // Provides the user's PIN and resumes the host authentication attempt. Call
   // on the UI thread once the user has finished entering this PIN into the UI,
   // but only after the UI has been asked to provide a PIN (via FetchSecret()).
   void ProvideSecret(const char* pin);
 
@@ skipping 34 matching lines @@
   void ConnectToHostOnDisplayThread();
   void ConnectToHostOnNetworkThread();
   void DisconnectFromHostOnNetworkThread();
 
   // Notifies the user interface that the user needs to enter a PIN. The
   // current authentication attempt is put on hold until |callback| is invoked.
   // May be called on any thread.
   void FetchSecret(bool pairable,
                    const protocol::SecretFetchedCallback& callback);
 
+  // Used to obtain task runner references and make calls to Java methods.
+  ChromotingJniRuntime* jni_runtime_;
+
   // This group of variables is to be used on the display thread.
   scoped_refptr<FrameConsumerProxy> frame_consumer_;
   scoped_ptr<JniFrameConsumer> view_;
   scoped_ptr<base::WeakPtrFactory<JniFrameConsumer> > view_weak_factory_;
 
   // This group of variables is to be used on the network thread.
   scoped_ptr<ClientConfig> client_config_;
   scoped_ptr<ClientContext> client_context_;
   scoped_ptr<protocol::ConnectionToHost> connection_;
   scoped_ptr<ChromotingClient> client_;
@@ skipping 16 matching lines @@
   std::string host_pubkey_;
 
   friend class base::RefCountedThreadSafe<ChromotingJniInstance>;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingJniInstance);
 };
 
 }  // namespace remoting
 
 #endif