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

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

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 scoped_ptr<PopupTouchHandleDrawable> PopupTouchHandleDrawable::Create( 13 std::unique_ptr<PopupTouchHandleDrawable> PopupTouchHandleDrawable::Create(
14 ContentViewCore* content_view_core) { 14 ContentViewCore* content_view_core) {
15 DCHECK(content_view_core); 15 DCHECK(content_view_core);
16 base::android::ScopedJavaLocalRef<jobject> content_view_core_obj = 16 base::android::ScopedJavaLocalRef<jobject> content_view_core_obj =
17 content_view_core->GetJavaObject(); 17 content_view_core->GetJavaObject();
18 if (content_view_core_obj.is_null()) 18 if (content_view_core_obj.is_null())
19 return nullptr; 19 return nullptr;
20 JNIEnv* env = base::android::AttachCurrentThread(); 20 JNIEnv* env = base::android::AttachCurrentThread();
21 base::android::ScopedJavaLocalRef<jobject> drawable_obj( 21 base::android::ScopedJavaLocalRef<jobject> drawable_obj(
22 Java_PopupTouchHandleDrawable_create(env, content_view_core_obj.obj())); 22 Java_PopupTouchHandleDrawable_create(env, content_view_core_obj.obj()));
23 return scoped_ptr<PopupTouchHandleDrawable>(new PopupTouchHandleDrawable( 23 return std::unique_ptr<PopupTouchHandleDrawable>(new PopupTouchHandleDrawable(
24 env, drawable_obj.obj(), content_view_core->GetDpiScale())); 24 env, drawable_obj.obj(), content_view_core->GetDpiScale()));
25 } 25 }
26 26
27 PopupTouchHandleDrawable::PopupTouchHandleDrawable(JNIEnv* env, 27 PopupTouchHandleDrawable::PopupTouchHandleDrawable(JNIEnv* env,
28 jobject obj, 28 jobject obj,
29 float dpi_scale) 29 float dpi_scale)
30 : java_ref_(env, obj), dpi_scale_(dpi_scale) { 30 : java_ref_(env, obj), dpi_scale_(dpi_scale) {
31 DCHECK(!java_ref_.is_empty()); 31 DCHECK(!java_ref_.is_empty());
32 drawable_horizontal_padding_ratio_ = 32 drawable_horizontal_padding_ratio_ =
33 Java_PopupTouchHandleDrawable_getHandleHorizontalPaddingRatio(env, obj); 33 Java_PopupTouchHandleDrawable_getHandleHorizontalPaddingRatio(env, obj);
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 float PopupTouchHandleDrawable::GetDrawableHorizontalPaddingRatio() const { 98 float PopupTouchHandleDrawable::GetDrawableHorizontalPaddingRatio() const {
99 return drawable_horizontal_padding_ratio_; 99 return drawable_horizontal_padding_ratio_;
100 } 100 }
101 101
102 // static 102 // static
103 bool PopupTouchHandleDrawable::RegisterPopupTouchHandleDrawable(JNIEnv* env) { 103 bool PopupTouchHandleDrawable::RegisterPopupTouchHandleDrawable(JNIEnv* env) {
104 return RegisterNativesImpl(env); 104 return RegisterNativesImpl(env);
105 } 105 }
106 106
107 } // namespace content 107 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/android/popup_touch_handle_drawable.h ('k') | content/browser/android/synchronous_compositor_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698