Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Side by Side Diff: blimp/client/app/android/tab_control_feature_android.cc

Issue 2201433002: Migrate TabControlFeature from 0.5 to 0.6 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: some more compile error fix Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/tab_control_feature_android.h" 5 #include "blimp/client/app/android/tab_control_feature_android.h"
6 6
7 #include "blimp/client/app/android/blimp_client_session_android.h" 7 #include "blimp/client/app/android/blimp_client_session_android.h"
8 #include "blimp/client/feature/tab_control_feature.h" 8 #include "blimp/client/core/contents/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 using base::android::JavaParamRef; 12 using base::android::JavaParamRef;
13 13
14 namespace blimp { 14 namespace blimp {
15 namespace client { 15 namespace client {
16 16
17 static jlong Init(JNIEnv* env, 17 static jlong Init(JNIEnv* env,
18 const JavaParamRef<jobject>& jobj, 18 const JavaParamRef<jobject>& jobj,
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 JNIEnv* env, 51 JNIEnv* env,
52 const JavaParamRef<jobject>& jobj, 52 const JavaParamRef<jobject>& jobj,
53 jint width, 53 jint width,
54 jint height, 54 jint height,
55 jfloat dp_to_px) { 55 jfloat dp_to_px) {
56 tab_control_feature_->SetSizeAndScale(gfx::Size(width, height), dp_to_px); 56 tab_control_feature_->SetSizeAndScale(gfx::Size(width, height), dp_to_px);
57 } 57 }
58 58
59 } // namespace client 59 } // namespace client
60 } // namespace blimp 60 } // namespace blimp
OLDNEW
« no previous file with comments | « blimp/client/app/android/blimp_client_session_android.cc ('k') | blimp/client/app/linux/blimp_display_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698