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

Unified Diff: chrome/browser/android/chrome_web_contents_delegate_android.cc

Issue 1315093002: Implement a bluetooth picker dialog for Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Re-add line removed during merge Created 5 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/android/chrome_web_contents_delegate_android.cc
diff --git a/chrome/browser/android/chrome_web_contents_delegate_android.cc b/chrome/browser/android/chrome_web_contents_delegate_android.cc
index e7c2fa604fb13b018f512bdd7c52ee6bb60d8ca2..a16fc47d87ade2c25217c4d0a396c7b8b95fbeff 100644
--- a/chrome/browser/android/chrome_web_contents_delegate_android.cc
+++ b/chrome/browser/android/chrome_web_contents_delegate_android.cc
@@ -17,6 +17,7 @@
#include "chrome/browser/prerender/prerender_manager.h"
#include "chrome/browser/prerender/prerender_manager_factory.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/android/bluetooth_chooser_android.h"
#include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
#include "chrome/browser/ui/browser_navigator.h"
#include "chrome/browser/ui/find_bar/find_notification_details.h"
@@ -42,6 +43,7 @@
using base::android::AttachCurrentThread;
using base::android::ScopedJavaLocalRef;
+using content::BluetoothChooser;
using content::FileChooserParams;
using content::WebContents;
@@ -103,6 +105,15 @@ void ChromeWebContentsDelegateAndroid::RunFileChooser(
FileSelectHelper::RunFileChooser(web_contents, params);
}
+scoped_ptr<BluetoothChooser>
+ChromeWebContentsDelegateAndroid::RunBluetoothChooser(
+ content::WebContents* web_contents,
+ const BluetoothChooser::EventHandler& event_handler,
+ const GURL& origin) {
+ return make_scoped_ptr(new BluetoothChooserAndroid(
+ web_contents, event_handler, origin));
+}
+
void ChromeWebContentsDelegateAndroid::CloseContents(
WebContents* web_contents) {
// Prevent dangling registrations assigned to closed web contents.

Powered by Google App Engine
This is Rietveld 408576698