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

Side by Side Diff: content/browser/android/popup_touch_handle_drawable.cc

Issue 2144703003: Remove ContentViewCore::GetDpiScale. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "content/browser/android/popup_touch_handle_drawable.h" 5 #include "content/browser/android/popup_touch_handle_drawable.h"
6 6
7 #include "content/public/browser/android/content_view_core.h" 7 #include "content/public/browser/android/content_view_core.h"
8 #include "jni/PopupTouchHandleDrawable_jni.h" 8 #include "jni/PopupTouchHandleDrawable_jni.h"
9 9
10 namespace content { 10 namespace content {
11 11
12 // static 12 // static
13 std::unique_ptr<PopupTouchHandleDrawable> PopupTouchHandleDrawable::Create( 13 std::unique_ptr<PopupTouchHandleDrawable> PopupTouchHandleDrawable::Create(
14 ContentViewCore* content_view_core) { 14 ContentViewCore* content_view_core,
15 float dpi_scale) {
15 DCHECK(content_view_core); 16 DCHECK(content_view_core);
16 base::android::ScopedJavaLocalRef<jobject> content_view_core_obj = 17 base::android::ScopedJavaLocalRef<jobject> content_view_core_obj =
17 content_view_core->GetJavaObject(); 18 content_view_core->GetJavaObject();
18 if (content_view_core_obj.is_null()) 19 if (content_view_core_obj.is_null())
19 return nullptr; 20 return nullptr;
20 JNIEnv* env = base::android::AttachCurrentThread(); 21 JNIEnv* env = base::android::AttachCurrentThread();
21 base::android::ScopedJavaLocalRef<jobject> drawable_obj( 22 base::android::ScopedJavaLocalRef<jobject> drawable_obj(
22 Java_PopupTouchHandleDrawable_create(env, content_view_core_obj.obj())); 23 Java_PopupTouchHandleDrawable_create(env, content_view_core_obj.obj()));
23 return std::unique_ptr<PopupTouchHandleDrawable>(new PopupTouchHandleDrawable( 24 return std::unique_ptr<PopupTouchHandleDrawable>(
24 env, drawable_obj.obj(), content_view_core->GetDpiScale())); 25 new PopupTouchHandleDrawable(env, drawable_obj.obj(), dpi_scale));
25 } 26 }
26 27
27 PopupTouchHandleDrawable::PopupTouchHandleDrawable(JNIEnv* env, 28 PopupTouchHandleDrawable::PopupTouchHandleDrawable(JNIEnv* env,
28 jobject obj, 29 jobject obj,
29 float dpi_scale) 30 float dpi_scale)
30 : java_ref_(env, obj), dpi_scale_(dpi_scale) { 31 : java_ref_(env, obj), dpi_scale_(dpi_scale) {
31 DCHECK(!java_ref_.is_empty()); 32 DCHECK(!java_ref_.is_empty());
32 drawable_horizontal_padding_ratio_ = 33 drawable_horizontal_padding_ratio_ =
33 Java_PopupTouchHandleDrawable_getHandleHorizontalPaddingRatio(env, obj); 34 Java_PopupTouchHandleDrawable_getHandleHorizontalPaddingRatio(env, obj);
34 } 35 }
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 float PopupTouchHandleDrawable::GetDrawableHorizontalPaddingRatio() const { 99 float PopupTouchHandleDrawable::GetDrawableHorizontalPaddingRatio() const {
99 return drawable_horizontal_padding_ratio_; 100 return drawable_horizontal_padding_ratio_;
100 } 101 }
101 102
102 // static 103 // static
103 bool PopupTouchHandleDrawable::RegisterPopupTouchHandleDrawable(JNIEnv* env) { 104 bool PopupTouchHandleDrawable::RegisterPopupTouchHandleDrawable(JNIEnv* env) {
104 return RegisterNativesImpl(env); 105 return RegisterNativesImpl(env);
105 } 106 }
106 107
107 } // namespace content 108 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698