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/session/tab_control_feature_android.h" | 5 #include "blimp/client/session/tab_control_feature_android.h" |
6 | 6 |
7 #include "blimp/client/session/blimp_client_session_android.h" | 7 #include "blimp/client/session/blimp_client_session_android.h" |
8 #include "blimp/client/session/tab_control_feature.h" | 8 #include "blimp/client/session/tab_control_feature.h" |
9 #include "jni/TabControlFeature_jni.h" | 9 #include "jni/TabControlFeature_jni.h" |
10 #include "ui/gfx/geometry/size.h" | 10 #include "ui/gfx/geometry/size.h" |
11 | 11 |
12 namespace blimp { | 12 namespace blimp { |
| 13 namespace client { |
13 | 14 |
14 static jlong Init(JNIEnv* env, | 15 static jlong Init(JNIEnv* env, |
15 const JavaParamRef<jobject>& jobj, | 16 const JavaParamRef<jobject>& jobj, |
16 const JavaParamRef<jobject>& blimp_client_session) { | 17 const JavaParamRef<jobject>& blimp_client_session) { |
17 BlimpClientSession* client_session = | 18 BlimpClientSession* client_session = |
18 BlimpClientSessionAndroid::FromJavaObject(env, | 19 BlimpClientSessionAndroid::FromJavaObject(env, |
19 blimp_client_session.obj()); | 20 blimp_client_session.obj()); |
20 | 21 |
21 return reinterpret_cast<intptr_t>( | 22 return reinterpret_cast<intptr_t>( |
22 new TabControlFeatureAndroid(env, | 23 new TabControlFeatureAndroid(env, |
(...skipping 23 matching lines...) Expand all Loading... |
46 | 47 |
47 void TabControlFeatureAndroid::OnContentAreaSizeChanged( | 48 void TabControlFeatureAndroid::OnContentAreaSizeChanged( |
48 JNIEnv* env, | 49 JNIEnv* env, |
49 const JavaParamRef<jobject>& jobj, | 50 const JavaParamRef<jobject>& jobj, |
50 jint width, | 51 jint width, |
51 jint height, | 52 jint height, |
52 jfloat dp_to_px) { | 53 jfloat dp_to_px) { |
53 tab_control_feature_->SetSizeAndScale(gfx::Size(width, height), dp_to_px); | 54 tab_control_feature_->SetSizeAndScale(gfx::Size(width, height), dp_to_px); |
54 } | 55 } |
55 | 56 |
| 57 } // namespace client |
56 } // namespace blimp | 58 } // namespace blimp |
OLD | NEW |