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

Unified Diff: chrome/browser/ui/android/bluetooth_chooser_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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/android/bluetooth_chooser_android.cc
diff --git a/chrome/browser/ui/android/bluetooth_chooser_android.cc b/chrome/browser/ui/android/bluetooth_chooser_android.cc
index 164963cf2540976d34dc0038949f363ef4226125..8b7aebd3422755ed9a0ecf88d959714279309055 100644
--- a/chrome/browser/ui/android/bluetooth_chooser_android.cc
+++ b/chrome/browser/ui/android/bluetooth_chooser_android.cc
@@ -47,7 +47,7 @@ BluetoothChooserAndroid::BluetoothChooserAndroid(
env,
url_formatter::FormatUrlForSecurityDisplay(GURL(origin.Serialize())));
java_dialog_.Reset(Java_BluetoothChooserDialog_create(
- env, window_android.obj(), origin_string.obj(),
+ env, window_android, origin_string,
security_model_client->GetSecurityInfo().security_level,
reinterpret_cast<intptr_t>(this)));
}
@@ -55,7 +55,7 @@ BluetoothChooserAndroid::BluetoothChooserAndroid(
BluetoothChooserAndroid::~BluetoothChooserAndroid() {
if (!java_dialog_.is_null()) {
Java_BluetoothChooserDialog_closeDialog(AttachCurrentThread(),
- java_dialog_.obj());
+ java_dialog_);
}
}
@@ -68,9 +68,9 @@ bool BluetoothChooserAndroid::CanAskForScanningPermission() {
void BluetoothChooserAndroid::SetAdapterPresence(AdapterPresence presence) {
JNIEnv* env = AttachCurrentThread();
if (presence != AdapterPresence::POWERED_ON) {
- Java_BluetoothChooserDialog_notifyAdapterTurnedOff(env, java_dialog_.obj());
+ Java_BluetoothChooserDialog_notifyAdapterTurnedOff(env, java_dialog_);
} else {
- Java_BluetoothChooserDialog_notifyAdapterTurnedOn(env, java_dialog_.obj());
+ Java_BluetoothChooserDialog_notifyAdapterTurnedOn(env, java_dialog_);
}
}
@@ -88,8 +88,8 @@ void BluetoothChooserAndroid::ShowDiscoveryState(DiscoveryState state) {
java_state = 2;
break;
}
- Java_BluetoothChooserDialog_notifyDiscoveryState(
- AttachCurrentThread(), java_dialog_.obj(), java_state);
+ Java_BluetoothChooserDialog_notifyDiscoveryState(AttachCurrentThread(),
+ java_dialog_, java_state);
}
void BluetoothChooserAndroid::AddOrUpdateDevice(
@@ -105,15 +105,14 @@ void BluetoothChooserAndroid::AddOrUpdateDevice(
ScopedJavaLocalRef<jstring> java_device_name =
ConvertUTF16ToJavaString(env, device_name);
Java_BluetoothChooserDialog_addOrUpdateDevice(
- env, java_dialog_.obj(), java_device_id.obj(), java_device_name.obj());
+ env, java_dialog_, java_device_id, java_device_name);
}
void BluetoothChooserAndroid::RemoveDevice(const std::string& device_id) {
JNIEnv* env = AttachCurrentThread();
ScopedJavaLocalRef<jstring> java_device_id =
ConvertUTF16ToJavaString(env, base::UTF8ToUTF16(device_id));
- Java_BluetoothChooserDialog_removeDevice(env, java_dialog_.obj(),
- java_device_id.obj());
+ Java_BluetoothChooserDialog_removeDevice(env, java_dialog_, java_device_id);
}
void BluetoothChooserAndroid::OnDialogFinished(

Powered by Google App Engine
This is Rietveld 408576698