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

Side by Side Diff: chrome/browser/ui/android/autofill/credit_card_scanner_view_android.cc

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 "chrome/browser/ui/android/autofill/credit_card_scanner_view_android.h" 5 #include "chrome/browser/ui/android/autofill/credit_card_scanner_view_android.h"
6 6
7 #include <memory>
8
7 #include "base/android/context_utils.h" 9 #include "base/android/context_utils.h"
8 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
9 #include "base/android/jni_string.h" 11 #include "base/android/jni_string.h"
10 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/ptr_util.h"
11 #include "chrome/browser/ui/android/view_android_helper.h" 13 #include "chrome/browser/ui/android/view_android_helper.h"
12 #include "chrome/browser/ui/autofill/credit_card_scanner_view_delegate.h" 14 #include "chrome/browser/ui/autofill/credit_card_scanner_view_delegate.h"
13 #include "content/public/browser/android/content_view_core.h" 15 #include "content/public/browser/android/content_view_core.h"
14 #include "jni/CreditCardScanner_jni.h" 16 #include "jni/CreditCardScanner_jni.h"
15 #include "ui/android/view_android.h" 17 #include "ui/android/view_android.h"
16 #include "ui/android/window_android.h" 18 #include "ui/android/window_android.h"
17 19
18 namespace autofill { 20 namespace autofill {
19 21
20 // static 22 // static
21 bool CreditCardScannerView::CanShow() { 23 bool CreditCardScannerView::CanShow() {
22 JNIEnv* env = base::android::AttachCurrentThread(); 24 JNIEnv* env = base::android::AttachCurrentThread();
23 base::android::ScopedJavaGlobalRef<jobject> java_object( 25 base::android::ScopedJavaGlobalRef<jobject> java_object(
24 Java_CreditCardScanner_create( 26 Java_CreditCardScanner_create(
25 env, 0, base::android::GetApplicationContext(), 0)); 27 env, 0, base::android::GetApplicationContext(), 0));
26 return Java_CreditCardScanner_canScan(env, java_object.obj()); 28 return Java_CreditCardScanner_canScan(env, java_object.obj());
27 } 29 }
28 30
29 // static 31 // static
30 scoped_ptr<CreditCardScannerView> CreditCardScannerView::Create( 32 std::unique_ptr<CreditCardScannerView> CreditCardScannerView::Create(
31 const base::WeakPtr<CreditCardScannerViewDelegate>& delegate, 33 const base::WeakPtr<CreditCardScannerViewDelegate>& delegate,
32 content::WebContents* web_contents) { 34 content::WebContents* web_contents) {
33 return make_scoped_ptr( 35 return base::WrapUnique(
34 new CreditCardScannerViewAndroid(delegate, web_contents)); 36 new CreditCardScannerViewAndroid(delegate, web_contents));
35 } 37 }
36 38
37 // static 39 // static
38 bool CreditCardScannerViewAndroid::Register(JNIEnv* env) { 40 bool CreditCardScannerViewAndroid::Register(JNIEnv* env) {
39 return RegisterNativesImpl(env); 41 return RegisterNativesImpl(env);
40 } 42 }
41 43
42 CreditCardScannerViewAndroid::CreditCardScannerViewAndroid( 44 CreditCardScannerViewAndroid::CreditCardScannerViewAndroid(
43 const base::WeakPtr<CreditCardScannerViewDelegate>& delegate, 45 const base::WeakPtr<CreditCardScannerViewDelegate>& delegate,
(...skipping 24 matching lines...) Expand all
68 base::android::ConvertJavaStringToUTF16(env, card_number), 70 base::android::ConvertJavaStringToUTF16(env, card_number),
69 static_cast<int>(expiration_month), static_cast<int>(expiration_year)); 71 static_cast<int>(expiration_month), static_cast<int>(expiration_year));
70 } 72 }
71 73
72 void CreditCardScannerViewAndroid::Show() { 74 void CreditCardScannerViewAndroid::Show() {
73 JNIEnv* env = base::android::AttachCurrentThread(); 75 JNIEnv* env = base::android::AttachCurrentThread();
74 Java_CreditCardScanner_scan(env, java_object_.obj()); 76 Java_CreditCardScanner_scan(env, java_object_.obj());
75 } 77 }
76 78
77 } // namespace autofill 79 } // namespace autofill
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698