| Index: remoting/client/jni/jni_client.h
|
| diff --git a/remoting/client/jni/jni_client.h b/remoting/client/jni/jni_client.h
|
| index 75e5c539789a39800e57b09515af619375c2e118..b5bbfeb94c69be5a863053280f076f22dfdcaeaa 100644
|
| --- a/remoting/client/jni/jni_client.h
|
| +++ b/remoting/client/jni/jni_client.h
|
| @@ -17,7 +17,7 @@ namespace remoting {
|
|
|
| class ChromotingJniRuntime;
|
| class ChromotingJniInstance;
|
| -class DisplayUpdaterFactory;
|
| +class JniGlDisplayHandler;
|
| class JniPairingSecretFetcher;
|
|
|
| // Houses resources scoped to a session and exposes JNI interface to the
|
| @@ -32,8 +32,7 @@ class JniClient {
|
| // Initiates a connection with the specified host. To skip the attempt at
|
| // pair-based authentication, leave |pairing_id| and |pairing_secret| as
|
| // empty strings.
|
| - void ConnectToHost(DisplayUpdaterFactory* updater_factory,
|
| - const std::string& username,
|
| + void ConnectToHost(const std::string& username,
|
| const std::string& auth_token,
|
| const std::string& host_jid,
|
| const std::string& host_id,
|
| @@ -157,7 +156,7 @@ class JniClient {
|
| // Reference to the Java client object.
|
| base::android::ScopedJavaGlobalRef<jobject> java_client_;
|
|
|
| - std::unique_ptr<DisplayUpdaterFactory> display_handler_;
|
| + std::unique_ptr<JniGlDisplayHandler> display_handler_;
|
|
|
| // Deleted on UI thread.
|
| std::unique_ptr<JniPairingSecretFetcher> secret_fetcher_;
|
|
|