| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef REMOTING_CLIENT_JNI_JNI_CLIENT_H_ | 5 #ifndef REMOTING_CLIENT_JNI_JNI_CLIENT_H_ |
| 6 #define REMOTING_CLIENT_JNI_JNI_CLIENT_H_ | 6 #define REMOTING_CLIENT_JNI_JNI_CLIENT_H_ |
| 7 | 7 |
| 8 #include <jni.h> | 8 #include <jni.h> |
| 9 | 9 |
| 10 #include "base/android/scoped_java_ref.h" | 10 #include "base/android/scoped_java_ref.h" |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 | 159 |
| 160 std::unique_ptr<DisplayUpdaterFactory> display_handler_; | 160 std::unique_ptr<DisplayUpdaterFactory> display_handler_; |
| 161 | 161 |
| 162 // Deleted on UI thread. | 162 // Deleted on UI thread. |
| 163 std::unique_ptr<JniPairingSecretFetcher> secret_fetcher_; | 163 std::unique_ptr<JniPairingSecretFetcher> secret_fetcher_; |
| 164 | 164 |
| 165 // Deleted on Network thread. | 165 // Deleted on Network thread. |
| 166 std::unique_ptr<ChromotingJniInstance> session_; | 166 std::unique_ptr<ChromotingJniInstance> session_; |
| 167 | 167 |
| 168 // Holds pointer for the UI thread. | 168 // Holds pointer for the UI thread. |
| 169 base::WeakPtr<JniClient> weak_ptr_; |
| 169 base::WeakPtrFactory<JniClient> weak_factory_; | 170 base::WeakPtrFactory<JniClient> weak_factory_; |
| 170 | 171 |
| 171 DISALLOW_COPY_AND_ASSIGN(JniClient); | 172 DISALLOW_COPY_AND_ASSIGN(JniClient); |
| 172 }; | 173 }; |
| 173 | 174 |
| 174 } // namespace remoting | 175 } // namespace remoting |
| 175 | 176 |
| 176 #endif // REMOTING_CLIENT_JNI_JNI_CLIENT_H_ | 177 #endif // REMOTING_CLIENT_JNI_JNI_CLIENT_H_ |
| OLD | NEW |