| 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/threading/thread_task_runner_handle.h" | 11 #include "base/threading/thread_task_runner_handle.h" |
| 12 #include "blimp/client/app/user_agent.h" | |
| 13 #include "blimp/client/core/contents/tab_control_feature.h" | 12 #include "blimp/client/core/contents/tab_control_feature.h" |
| 14 #include "blimp/client/core/session/assignment_source.h" | 13 #include "blimp/client/core/session/assignment_source.h" |
| 15 #include "blimp/client/core/settings/settings_feature.h" | 14 #include "blimp/client/core/settings/settings_feature.h" |
| 16 #include "blimp/net/blimp_stats.h" | 15 #include "blimp/net/blimp_stats.h" |
| 17 #include "components/version_info/version_info.h" | 16 #include "components/version_info/version_info.h" |
| 18 #include "jni/BlimpClientSession_jni.h" | 17 #include "jni/BlimpClientSession_jni.h" |
| 19 #include "net/base/net_errors.h" | 18 #include "net/base/net_errors.h" |
| 20 #include "ui/android/window_android.h" | 19 #include "ui/android/window_android.h" |
| 21 | 20 |
| 22 namespace blimp { | 21 namespace blimp { |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 jlong window_android_ptr) | 59 jlong window_android_ptr) |
| 61 : BlimpClientSession(CreateAssignerGURL( | 60 : BlimpClientSession(CreateAssignerGURL( |
| 62 base::android::ConvertJavaStringToUTF8(jassigner_url))) { | 61 base::android::ConvertJavaStringToUTF8(jassigner_url))) { |
| 63 java_obj_.Reset(env, jobj); | 62 java_obj_.Reset(env, jobj); |
| 64 | 63 |
| 65 ui::WindowAndroid* window = | 64 ui::WindowAndroid* window = |
| 66 reinterpret_cast<ui::WindowAndroid*>(window_android_ptr); | 65 reinterpret_cast<ui::WindowAndroid*>(window_android_ptr); |
| 67 ime_dialog_.reset(new ImeHelperDialog(window)); | 66 ime_dialog_.reset(new ImeHelperDialog(window)); |
| 68 GetImeFeature()->set_delegate(ime_dialog_.get()); | 67 GetImeFeature()->set_delegate(ime_dialog_.get()); |
| 69 | 68 |
| 70 // Send OS info before creating any tab. | |
| 71 GetSettingsFeature()->SendUserAgentOSVersionInfo( | |
| 72 GetOSVersionInfoForUserAgent()); | |
| 73 | |
| 74 // Create a single tab's WebContents. | 69 // Create a single tab's WebContents. |
| 75 // TODO(kmarshall): Remove this once we add tab-literacy to Blimp. | 70 // TODO(kmarshall): Remove this once we add tab-literacy to Blimp. |
| 76 GetTabControlFeature()->CreateTab(kDummyTabId); | 71 GetTabControlFeature()->CreateTab(kDummyTabId); |
| 77 } | 72 } |
| 78 | 73 |
| 79 void BlimpClientSessionAndroid::Connect( | 74 void BlimpClientSessionAndroid::Connect( |
| 80 JNIEnv* env, | 75 JNIEnv* env, |
| 81 const base::android::JavaParamRef<jobject>& jobj, | 76 const base::android::JavaParamRef<jobject>& jobj, |
| 82 const base::android::JavaParamRef<jstring>& jclient_auth_token) { | 77 const base::android::JavaParamRef<jstring>& jclient_auth_token) { |
| 83 std::string client_auth_token; | 78 std::string client_auth_token; |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 const base::android::JavaParamRef<jobject>& jobj) { | 128 const base::android::JavaParamRef<jobject>& jobj) { |
| 134 BlimpStats* stats = BlimpStats::GetInstance(); | 129 BlimpStats* stats = BlimpStats::GetInstance(); |
| 135 int metrics[] = {stats->Get(BlimpStats::BYTES_RECEIVED), | 130 int metrics[] = {stats->Get(BlimpStats::BYTES_RECEIVED), |
| 136 stats->Get(BlimpStats::BYTES_SENT), | 131 stats->Get(BlimpStats::BYTES_SENT), |
| 137 stats->Get(BlimpStats::COMMIT)}; | 132 stats->Get(BlimpStats::COMMIT)}; |
| 138 return base::android::ToJavaIntArray(env, metrics, arraysize(metrics)); | 133 return base::android::ToJavaIntArray(env, metrics, arraysize(metrics)); |
| 139 } | 134 } |
| 140 | 135 |
| 141 } // namespace client | 136 } // namespace client |
| 142 } // namespace blimp | 137 } // namespace blimp |
| OLD | NEW |