| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/android/chrome_web_contents_delegate_android.h" | 5 #include "chrome/browser/android/chrome_web_contents_delegate_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/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 CreateJavaRectF(env, rects[i]).obj()); | 207 CreateJavaRectF(env, rects[i]).obj()); |
| 208 } | 208 } |
| 209 | 209 |
| 210 Java_ChromeWebContentsDelegateAndroid_onFindMatchRectsAvailable( | 210 Java_ChromeWebContentsDelegateAndroid_onFindMatchRectsAvailable( |
| 211 env, | 211 env, |
| 212 obj.obj(), | 212 obj.obj(), |
| 213 details_object.obj()); | 213 details_object.obj()); |
| 214 } | 214 } |
| 215 | 215 |
| 216 content::JavaScriptDialogManager* | 216 content::JavaScriptDialogManager* |
| 217 ChromeWebContentsDelegateAndroid::GetJavaScriptDialogManager() { | 217 ChromeWebContentsDelegateAndroid::GetJavaScriptDialogManager( |
| 218 WebContents* source) { |
| 218 return GetJavaScriptDialogManagerInstance(); | 219 return GetJavaScriptDialogManagerInstance(); |
| 219 } | 220 } |
| 220 | 221 |
| 221 void ChromeWebContentsDelegateAndroid::RequestMediaAccessPermission( | 222 void ChromeWebContentsDelegateAndroid::RequestMediaAccessPermission( |
| 222 content::WebContents* web_contents, | 223 content::WebContents* web_contents, |
| 223 const content::MediaStreamRequest& request, | 224 const content::MediaStreamRequest& request, |
| 224 const content::MediaResponseCallback& callback) { | 225 const content::MediaResponseCallback& callback) { |
| 225 MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest( | 226 MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest( |
| 226 web_contents, request, callback, NULL); | 227 web_contents, request, callback, NULL); |
| 227 } | 228 } |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 } | 333 } |
| 333 | 334 |
| 334 if (was_blocked) | 335 if (was_blocked) |
| 335 *was_blocked = !handled; | 336 *was_blocked = !handled; |
| 336 if (!handled) | 337 if (!handled) |
| 337 delete new_contents; | 338 delete new_contents; |
| 338 } | 339 } |
| 339 | 340 |
| 340 } // namespace android | 341 } // namespace android |
| 341 } // namespace chrome | 342 } // namespace chrome |
| OLD | NEW |