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 #include "blimp/client/app/android/blimp_client_session_android.h" | 5 #include "blimp/client/app/android/blimp_client_session_android.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
10 #include "base/android/scoped_java_ref.h" | 10 #include "base/android/scoped_java_ref.h" |
11 #include "base/thread_task_runner_handle.h" | 11 #include "base/threading/thread_task_runner_handle.h" |
12 #include "blimp/client/app/user_agent.h" | 12 #include "blimp/client/app/user_agent.h" |
13 #include "blimp/client/feature/settings_feature.h" | 13 #include "blimp/client/feature/settings_feature.h" |
14 #include "blimp/client/feature/tab_control_feature.h" | 14 #include "blimp/client/feature/tab_control_feature.h" |
15 #include "blimp/client/session/assignment_source.h" | 15 #include "blimp/client/session/assignment_source.h" |
16 #include "blimp/common/protocol_version.h" | 16 #include "blimp/common/protocol_version.h" |
17 #include "jni/BlimpClientSession_jni.h" | 17 #include "jni/BlimpClientSession_jni.h" |
18 #include "net/base/net_errors.h" | 18 #include "net/base/net_errors.h" |
19 | 19 |
20 namespace blimp { | 20 namespace blimp { |
21 namespace client { | 21 namespace client { |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 Java_BlimpClientSession_onAssignmentReceived( | 108 Java_BlimpClientSession_onAssignmentReceived( |
109 env, java_obj_.obj(), static_cast<jint>(result), | 109 env, java_obj_.obj(), static_cast<jint>(result), |
110 base::android::ConvertUTF8ToJavaString(env, engine_ip).obj(), | 110 base::android::ConvertUTF8ToJavaString(env, engine_ip).obj(), |
111 base::android::ConvertUTF8ToJavaString(env, blimp::kEngineVersion).obj()); | 111 base::android::ConvertUTF8ToJavaString(env, blimp::kEngineVersion).obj()); |
112 | 112 |
113 BlimpClientSession::OnAssignmentConnectionAttempted(result, assignment); | 113 BlimpClientSession::OnAssignmentConnectionAttempted(result, assignment); |
114 } | 114 } |
115 | 115 |
116 } // namespace client | 116 } // namespace client |
117 } // namespace blimp | 117 } // namespace blimp |
OLD | NEW |