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" | 12 #include "blimp/client/app/user_agent.h" |
13 #include "blimp/client/core/session/assignment_source.h" | 13 #include "blimp/client/core/session/assignment_source.h" |
14 #include "blimp/client/feature/settings_feature.h" | 14 #include "blimp/client/feature/settings_feature.h" |
15 #include "blimp/client/feature/tab_control_feature.h" | 15 #include "blimp/client/feature/tab_control_feature.h" |
16 #include "components/version_info/version_info.h" | 16 #include "components/version_info/version_info.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 using base::android::JavaParamRef; |
| 21 |
20 namespace blimp { | 22 namespace blimp { |
21 namespace client { | 23 namespace client { |
22 namespace { | 24 namespace { |
23 const int kDummyTabId = 0; | 25 const int kDummyTabId = 0; |
24 | 26 |
25 GURL CreateAssignerGURL(const std::string& assigner_url) { | 27 GURL CreateAssignerGURL(const std::string& assigner_url) { |
26 GURL parsed_url(assigner_url); | 28 GURL parsed_url(assigner_url); |
27 CHECK(parsed_url.is_valid()); | 29 CHECK(parsed_url.is_valid()); |
28 return parsed_url; | 30 return parsed_url; |
29 } | 31 } |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
123 BlimpConnectionStatistics* stats = | 125 BlimpConnectionStatistics* stats = |
124 BlimpClientSession::GetBlimpConnectionStatistics(); | 126 BlimpClientSession::GetBlimpConnectionStatistics(); |
125 int metrics[] = {stats->Get(BlimpConnectionStatistics::BYTES_RECEIVED), | 127 int metrics[] = {stats->Get(BlimpConnectionStatistics::BYTES_RECEIVED), |
126 stats->Get(BlimpConnectionStatistics::BYTES_SENT), | 128 stats->Get(BlimpConnectionStatistics::BYTES_SENT), |
127 stats->Get(BlimpConnectionStatistics::COMMIT)}; | 129 stats->Get(BlimpConnectionStatistics::COMMIT)}; |
128 return base::android::ToJavaIntArray(env, metrics, arraysize(metrics)); | 130 return base::android::ToJavaIntArray(env, metrics, arraysize(metrics)); |
129 } | 131 } |
130 | 132 |
131 } // namespace client | 133 } // namespace client |
132 } // namespace blimp | 134 } // namespace blimp |
OLD | NEW |