Chromium Code Reviews| 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 7924f64c50a6f65b02c55da99a29f8ca52f19835..ab088282c6b260725ae37a2ab7431ff4df6a42a4 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( |
| + origin, web_contents, event_handler)); |
|
Jeffrey Yasskin
2015/08/28 18:16:33
Unless there's a reason not to, keep these in the
Finnur
2015/08/31 15:25:22
Done.
|
| +} |
| + |
| void ChromeWebContentsDelegateAndroid::CloseContents( |
| WebContents* web_contents) { |
| // Prevent dangling registrations assigned to closed web contents. |