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

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

Issue 2237943002: Remove now-unnecessary .obj() in Java method calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@switch-context
Patch Set: Rebase *again* :( 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 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/card_unmask_prompt_view_android.h" 5 #include "chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.h"
6 6
7 #include "chrome/browser/android/resource_mapper.h" 7 #include "chrome/browser/android/resource_mapper.h"
8 #include "chrome/browser/ui/autofill/create_card_unmask_prompt_view.h" 8 #include "chrome/browser/ui/autofill/create_card_unmask_prompt_view.h"
9 #include "components/autofill/core/browser/ui/card_unmask_prompt_controller.h" 9 #include "components/autofill/core/browser/ui/card_unmask_prompt_controller.h"
10 #include "content/public/browser/web_contents.h" 10 #include "content/public/browser/web_contents.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 base::android::ConvertUTF16ToJavaString(env, 42 base::android::ConvertUTF16ToJavaString(env,
43 controller_->GetWindowTitle()); 43 controller_->GetWindowTitle());
44 ScopedJavaLocalRef<jstring> instructions = 44 ScopedJavaLocalRef<jstring> instructions =
45 base::android::ConvertUTF16ToJavaString( 45 base::android::ConvertUTF16ToJavaString(
46 env, controller_->GetInstructionsMessage()); 46 env, controller_->GetInstructionsMessage());
47 47
48 ScopedJavaLocalRef<jstring> confirm = base::android::ConvertUTF16ToJavaString( 48 ScopedJavaLocalRef<jstring> confirm = base::android::ConvertUTF16ToJavaString(
49 env, controller_->GetOkButtonLabel()); 49 env, controller_->GetOkButtonLabel());
50 50
51 java_object_.Reset(Java_CardUnmaskBridge_create( 51 java_object_.Reset(Java_CardUnmaskBridge_create(
52 env, reinterpret_cast<intptr_t>(this), dialog_title.obj(), 52 env, reinterpret_cast<intptr_t>(this), dialog_title, instructions,
53 instructions.obj(), confirm.obj(), 53 confirm, ResourceMapper::MapFromChromiumId(controller_->GetCvcImageRid()),
54 ResourceMapper::MapFromChromiumId(controller_->GetCvcImageRid()),
55 controller_->ShouldRequestExpirationDate(), 54 controller_->ShouldRequestExpirationDate(),
56 controller_->CanStoreLocally(), 55 controller_->CanStoreLocally(), controller_->GetStoreLocallyStartState(),
57 controller_->GetStoreLocallyStartState(), 56 view_android->GetWindowAndroid()->GetJavaObject()));
58 view_android->GetWindowAndroid()->GetJavaObject().obj()));
59 57
60 Java_CardUnmaskBridge_show(env, java_object_.obj()); 58 Java_CardUnmaskBridge_show(env, java_object_);
61 } 59 }
62 60
63 bool CardUnmaskPromptViewAndroid::CheckUserInputValidity( 61 bool CardUnmaskPromptViewAndroid::CheckUserInputValidity(
64 JNIEnv* env, 62 JNIEnv* env,
65 const JavaParamRef<jobject>& obj, 63 const JavaParamRef<jobject>& obj,
66 const JavaParamRef<jstring>& response) { 64 const JavaParamRef<jstring>& response) {
67 return controller_->InputCvcIsValid( 65 return controller_->InputCvcIsValid(
68 base::android::ConvertJavaStringToUTF16(env, response)); 66 base::android::ConvertJavaStringToUTF16(env, response));
69 } 67 }
70 68
71 void CardUnmaskPromptViewAndroid::OnUserInput( 69 void CardUnmaskPromptViewAndroid::OnUserInput(
72 JNIEnv* env, 70 JNIEnv* env,
73 const JavaParamRef<jobject>& obj, 71 const JavaParamRef<jobject>& obj,
74 const JavaParamRef<jstring>& cvc, 72 const JavaParamRef<jstring>& cvc,
75 const JavaParamRef<jstring>& month, 73 const JavaParamRef<jstring>& month,
76 const JavaParamRef<jstring>& year, 74 const JavaParamRef<jstring>& year,
77 jboolean should_store_locally) { 75 jboolean should_store_locally) {
78 controller_->OnUnmaskResponse( 76 controller_->OnUnmaskResponse(
79 base::android::ConvertJavaStringToUTF16(env, cvc), 77 base::android::ConvertJavaStringToUTF16(env, cvc),
80 base::android::ConvertJavaStringToUTF16(env, month), 78 base::android::ConvertJavaStringToUTF16(env, month),
81 base::android::ConvertJavaStringToUTF16(env, year), 79 base::android::ConvertJavaStringToUTF16(env, year),
82 should_store_locally); 80 should_store_locally);
83 } 81 }
84 82
85 void CardUnmaskPromptViewAndroid::OnNewCardLinkClicked( 83 void CardUnmaskPromptViewAndroid::OnNewCardLinkClicked(
86 JNIEnv* env, 84 JNIEnv* env,
87 const JavaParamRef<jobject>& obj) { 85 const JavaParamRef<jobject>& obj) {
88 controller_->NewCardLinkClicked(); 86 controller_->NewCardLinkClicked();
89 Java_CardUnmaskBridge_update(env, java_object_.obj(), 87 Java_CardUnmaskBridge_update(env, java_object_,
90 base::android::ConvertUTF16ToJavaString( 88 base::android::ConvertUTF16ToJavaString(
91 env, controller_->GetWindowTitle()).obj(), 89 env, controller_->GetWindowTitle()),
92 base::android::ConvertUTF16ToJavaString( 90 base::android::ConvertUTF16ToJavaString(
93 env, controller_->GetInstructionsMessage()).obj(), 91 env, controller_->GetInstructionsMessage()),
94 controller_->ShouldRequestExpirationDate()); 92 controller_->ShouldRequestExpirationDate());
95 } 93 }
96 94
97 void CardUnmaskPromptViewAndroid::PromptDismissed( 95 void CardUnmaskPromptViewAndroid::PromptDismissed(
98 JNIEnv* env, 96 JNIEnv* env,
99 const JavaParamRef<jobject>& obj) { 97 const JavaParamRef<jobject>& obj) {
100 delete this; 98 delete this;
101 } 99 }
102 100
103 void CardUnmaskPromptViewAndroid::ControllerGone() { 101 void CardUnmaskPromptViewAndroid::ControllerGone() {
104 controller_ = nullptr; 102 controller_ = nullptr;
105 JNIEnv* env = base::android::AttachCurrentThread(); 103 JNIEnv* env = base::android::AttachCurrentThread();
106 Java_CardUnmaskBridge_dismiss(env, java_object_.obj()); 104 Java_CardUnmaskBridge_dismiss(env, java_object_);
107 } 105 }
108 106
109 void CardUnmaskPromptViewAndroid::DisableAndWaitForVerification() { 107 void CardUnmaskPromptViewAndroid::DisableAndWaitForVerification() {
110 JNIEnv* env = base::android::AttachCurrentThread(); 108 JNIEnv* env = base::android::AttachCurrentThread();
111 Java_CardUnmaskBridge_disableAndWaitForVerification(env, java_object_.obj()); 109 Java_CardUnmaskBridge_disableAndWaitForVerification(env, java_object_);
112 } 110 }
113 111
114 void CardUnmaskPromptViewAndroid::GotVerificationResult( 112 void CardUnmaskPromptViewAndroid::GotVerificationResult(
115 const base::string16& error_message, 113 const base::string16& error_message,
116 bool allow_retry) { 114 bool allow_retry) {
117 JNIEnv* env = base::android::AttachCurrentThread(); 115 JNIEnv* env = base::android::AttachCurrentThread();
118 ScopedJavaLocalRef<jstring> message; 116 ScopedJavaLocalRef<jstring> message;
119 if (!error_message.empty()) 117 if (!error_message.empty())
120 message = base::android::ConvertUTF16ToJavaString(env, error_message); 118 message = base::android::ConvertUTF16ToJavaString(env, error_message);
121 119
122 Java_CardUnmaskBridge_verificationFinished(env, java_object_.obj(), 120 Java_CardUnmaskBridge_verificationFinished(env, java_object_, message,
123 message.obj(), allow_retry); 121 allow_retry);
124 } 122 }
125 123
126 // static 124 // static
127 bool CardUnmaskPromptViewAndroid::Register(JNIEnv* env) { 125 bool CardUnmaskPromptViewAndroid::Register(JNIEnv* env) {
128 return RegisterNativesImpl(env); 126 return RegisterNativesImpl(env);
129 } 127 }
130 128
131 } // namespace autofill 129 } // namespace autofill
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698