chrome/browser/ui/android/bluetooth_chooser_android.cc - Issue 2210873003: bluetooth: Allow updates on chooser items.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/android/bluetooth_chooser_android.cc

Issue 2210873003: bluetooth: Allow updates on chooser items. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-fix-advertised-services

Patch Set: Fix content_shell 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

« no previous file with comments | « chrome/browser/ui/android/bluetooth_chooser_android.h ('k') | chrome/browser/ui/bluetooth/bluetooth_chooser_controller.h » ('j') | chrome/browser/ui/bluetooth/bluetooth_chooser_controller.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 66c752e1d55c3965d4ace321e18c4daefe507b06..2c17715d912803a8832d7d0a3d4ab71a69c5ddec 100644

--- a/chrome/browser/ui/android/bluetooth_chooser_android.cc

+++ b/chrome/browser/ui/android/bluetooth_chooser_android.cc

@@ -91,14 +91,15 @@ void BluetoothChooserAndroid::ShowDiscoveryState(DiscoveryState state) {

AttachCurrentThread(), java_dialog_.obj(), java_state);

}

-void BluetoothChooserAndroid::AddDevice(const std::string& device_id,

- const base::string16& device_name) {

+void BluetoothChooserAndroid::AddOrUpdateDevice(

+ const std::string& device_id,

+ const base::string16& device_name) {

JNIEnv* env = AttachCurrentThread();

ScopedJavaLocalRef<jstring> java_device_id =

ConvertUTF8ToJavaString(env, device_id);

ScopedJavaLocalRef<jstring> java_device_name =

ConvertUTF16ToJavaString(env, device_name);

- Java_BluetoothChooserDialog_addDevice(

+ Java_BluetoothChooserDialog_addOrUpdateDevice(

env, java_dialog_.obj(), java_device_id.obj(), java_device_name.obj());

}