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

Side by Side Diff: chrome/browser/ui/android/bluetooth_chooser_android.cc

Issue 2431243003: bluetooth: Show connected icon for connected devices. (Closed)
Patch Set: Rebase Created 4 years, 2 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/bluetooth_chooser_android.h" 5 #include "chrome/browser/ui/android/bluetooth_chooser_android.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/ssl/chrome_security_state_model_client.h" 10 #include "chrome/browser/ssl/chrome_security_state_model_client.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 const base::string16& device_name, 98 const base::string16& device_name,
99 bool is_gatt_connected, 99 bool is_gatt_connected,
100 bool is_paired, 100 bool is_paired,
101 int signal_strength_level) { 101 int signal_strength_level) {
102 JNIEnv* env = AttachCurrentThread(); 102 JNIEnv* env = AttachCurrentThread();
103 ScopedJavaLocalRef<jstring> java_device_id = 103 ScopedJavaLocalRef<jstring> java_device_id =
104 ConvertUTF8ToJavaString(env, device_id); 104 ConvertUTF8ToJavaString(env, device_id);
105 ScopedJavaLocalRef<jstring> java_device_name = 105 ScopedJavaLocalRef<jstring> java_device_name =
106 ConvertUTF16ToJavaString(env, device_name); 106 ConvertUTF16ToJavaString(env, device_name);
107 Java_BluetoothChooserDialog_addOrUpdateDevice( 107 Java_BluetoothChooserDialog_addOrUpdateDevice(
108 env, java_dialog_, java_device_id, java_device_name); 108 env, java_dialog_, java_device_id, java_device_name, is_gatt_connected);
109 } 109 }
110 110
111 void BluetoothChooserAndroid::RemoveDevice(const std::string& device_id) { 111 void BluetoothChooserAndroid::RemoveDevice(const std::string& device_id) {
112 JNIEnv* env = AttachCurrentThread(); 112 JNIEnv* env = AttachCurrentThread();
113 ScopedJavaLocalRef<jstring> java_device_id = 113 ScopedJavaLocalRef<jstring> java_device_id =
114 ConvertUTF16ToJavaString(env, base::UTF8ToUTF16(device_id)); 114 ConvertUTF16ToJavaString(env, base::UTF8ToUTF16(device_id));
115 Java_BluetoothChooserDialog_removeDevice(env, java_dialog_, java_device_id); 115 Java_BluetoothChooserDialog_removeDevice(env, java_dialog_, java_device_id);
116 } 116 }
117 117
118 void BluetoothChooserAndroid::OnDialogFinished( 118 void BluetoothChooserAndroid::OnDialogFinished(
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 // static 170 // static
171 bool BluetoothChooserAndroid::Register(JNIEnv* env) { 171 bool BluetoothChooserAndroid::Register(JNIEnv* env) {
172 return RegisterNativesImpl(env); 172 return RegisterNativesImpl(env);
173 } 173 }
174 174
175 void BluetoothChooserAndroid::OpenURL(const char* url) { 175 void BluetoothChooserAndroid::OpenURL(const char* url) {
176 web_contents_->OpenURL(content::OpenURLParams( 176 web_contents_->OpenURL(content::OpenURLParams(
177 GURL(url), content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB, 177 GURL(url), content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
178 ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false /* is_renderer_initiated */)); 178 ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false /* is_renderer_initiated */));
179 } 179 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698