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

Side by Side Diff: chrome/browser/ui/android/chrome_http_auth_handler.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chrome_http_auth_handler.h" 5 #include "chrome/browser/ui/android/chrome_http_auth_handler.h"
6 6
7 #include <jni.h> 7 #include <jni.h>
8 8
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
(...skipping 24 matching lines...) Expand all
35 java_chrome_http_auth_handler_.Reset( 35 java_chrome_http_auth_handler_.Reset(
36 Java_ChromeHttpAuthHandler_create(env, reinterpret_cast<intptr_t>(this))); 36 Java_ChromeHttpAuthHandler_create(env, reinterpret_cast<intptr_t>(this)));
37 } 37 }
38 38
39 void ChromeHttpAuthHandler::SetObserver(LoginHandler* observer) { 39 void ChromeHttpAuthHandler::SetObserver(LoginHandler* observer) {
40 observer_ = observer; 40 observer_ = observer;
41 } 41 }
42 42
43 void ChromeHttpAuthHandler::ShowDialog(jobject window_android) { 43 void ChromeHttpAuthHandler::ShowDialog(jobject window_android) {
44 JNIEnv* env = AttachCurrentThread(); 44 JNIEnv* env = AttachCurrentThread();
45 Java_ChromeHttpAuthHandler_showDialog( 45 Java_ChromeHttpAuthHandler_showDialog(env, java_chrome_http_auth_handler_,
46 env, 46 window_android);
47 java_chrome_http_auth_handler_.obj(),
48 window_android);
49 } 47 }
50 48
51 void ChromeHttpAuthHandler::OnAutofillDataAvailable( 49 void ChromeHttpAuthHandler::OnAutofillDataAvailable(
52 const base::string16& username, 50 const base::string16& username,
53 const base::string16& password) { 51 const base::string16& password) {
54 DCHECK(java_chrome_http_auth_handler_.obj() != NULL); 52 DCHECK(java_chrome_http_auth_handler_.obj() != NULL);
55 JNIEnv* env = base::android::AttachCurrentThread(); 53 JNIEnv* env = base::android::AttachCurrentThread();
56 ScopedJavaLocalRef<jstring> j_username = 54 ScopedJavaLocalRef<jstring> j_username =
57 ConvertUTF16ToJavaString(env, username); 55 ConvertUTF16ToJavaString(env, username);
58 ScopedJavaLocalRef<jstring> j_password = 56 ScopedJavaLocalRef<jstring> j_password =
59 ConvertUTF16ToJavaString(env, password); 57 ConvertUTF16ToJavaString(env, password);
60 Java_ChromeHttpAuthHandler_onAutofillDataAvailable( 58 Java_ChromeHttpAuthHandler_onAutofillDataAvailable(
61 env, java_chrome_http_auth_handler_.obj(), 59 env, java_chrome_http_auth_handler_, j_username, j_password);
62 j_username.obj(), j_password.obj());
63 } 60 }
64 61
65 void ChromeHttpAuthHandler::SetAuth(JNIEnv* env, 62 void ChromeHttpAuthHandler::SetAuth(JNIEnv* env,
66 const JavaParamRef<jobject>&, 63 const JavaParamRef<jobject>&,
67 const JavaParamRef<jstring>& username, 64 const JavaParamRef<jstring>& username,
68 const JavaParamRef<jstring>& password) { 65 const JavaParamRef<jstring>& password) {
69 if (observer_) { 66 if (observer_) {
70 base::string16 username16 = ConvertJavaStringToUTF16(env, username); 67 base::string16 username16 = ConvertJavaStringToUTF16(env, username);
71 base::string16 password16 = ConvertJavaStringToUTF16(env, password); 68 base::string16 password16 = ConvertJavaStringToUTF16(env, password);
72 observer_->SetAuth(username16, password16); 69 observer_->SetAuth(username16, password16);
(...skipping 12 matching lines...) Expand all
85 if (explanation_.empty()) 82 if (explanation_.empty())
86 return ConvertUTF16ToJavaString(env, authority_); 83 return ConvertUTF16ToJavaString(env, authority_);
87 return ConvertUTF16ToJavaString( 84 return ConvertUTF16ToJavaString(
88 env, authority_ + base::ASCIIToUTF16(" ") + explanation_); 85 env, authority_ + base::ASCIIToUTF16(" ") + explanation_);
89 } 86 }
90 87
91 // static 88 // static
92 bool ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler(JNIEnv* env) { 89 bool ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler(JNIEnv* env) {
93 return RegisterNativesImpl(env); 90 return RegisterNativesImpl(env);
94 } 91 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/android/bluetooth_chooser_android.cc ('k') | chrome/browser/ui/android/connection_info_popup_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698