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/android/feature_utilities.h" |
10 #include "chrome/browser/chrome_notification_types.h" | 11 #include "chrome/browser/chrome_notification_types.h" |
11 #include "chrome/browser/file_select_helper.h" | 12 #include "chrome/browser/file_select_helper.h" |
12 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 13 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
13 #include "chrome/browser/media/media_stream_capture_indicator.h" | 14 #include "chrome/browser/media/media_stream_capture_indicator.h" |
14 #include "chrome/browser/media/protected_media_identifier_permission_context.h" | 15 #include "chrome/browser/media/protected_media_identifier_permission_context.h" |
15 #include "chrome/browser/media/protected_media_identifier_permission_context_fac
tory.h" | 16 #include "chrome/browser/media/protected_media_identifier_permission_context_fac
tory.h" |
16 #include "chrome/browser/prerender/prerender_manager.h" | 17 #include "chrome/browser/prerender/prerender_manager.h" |
17 #include "chrome/browser/prerender/prerender_manager_factory.h" | 18 #include "chrome/browser/prerender/prerender_manager_factory.h" |
18 #include "chrome/browser/profiles/profile.h" | 19 #include "chrome/browser/profiles/profile.h" |
19 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" | 20 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" |
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
298 prerender::PrerenderManagerFactory::GetForProfile(profile); | 299 prerender::PrerenderManagerFactory::GetForProfile(profile); |
299 if (prerender_manager && | 300 if (prerender_manager && |
300 prerender_manager->MaybeUsePrerenderedPage(params.url, &nav_params)) { | 301 prerender_manager->MaybeUsePrerenderedPage(params.url, &nav_params)) { |
301 return nav_params.target_contents; | 302 return nav_params.target_contents; |
302 } | 303 } |
303 } | 304 } |
304 | 305 |
305 return WebContentsDelegateAndroid::OpenURLFromTab(source, params); | 306 return WebContentsDelegateAndroid::OpenURLFromTab(source, params); |
306 } | 307 } |
307 | 308 |
| 309 bool ChromeWebContentsDelegateAndroid::ShouldResumeRequestsForCreatedWindow() { |
| 310 return chrome::android::GetDocumentModeValue() == |
| 311 chrome::android::RUNNING_MODE_TABBED_MODE; |
| 312 } |
| 313 |
308 void ChromeWebContentsDelegateAndroid::AddNewContents( | 314 void ChromeWebContentsDelegateAndroid::AddNewContents( |
309 WebContents* source, | 315 WebContents* source, |
310 WebContents* new_contents, | 316 WebContents* new_contents, |
311 WindowOpenDisposition disposition, | 317 WindowOpenDisposition disposition, |
312 const gfx::Rect& initial_rect, | 318 const gfx::Rect& initial_rect, |
313 bool user_gesture, | 319 bool user_gesture, |
314 bool* was_blocked) { | 320 bool* was_blocked) { |
315 // No code for this yet. | 321 // No code for this yet. |
316 DCHECK_NE(disposition, SAVE_TO_DISK); | 322 DCHECK_NE(disposition, SAVE_TO_DISK); |
317 // Can't create a new contents for the current tab - invalid case. | 323 // Can't create a new contents for the current tab - invalid case. |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
371 return indicator->IsCapturingVideo(web_contents); | 377 return indicator->IsCapturingVideo(web_contents); |
372 } | 378 } |
373 | 379 |
374 jboolean HasAudibleAudio(JNIEnv* env, | 380 jboolean HasAudibleAudio(JNIEnv* env, |
375 jclass clazz, | 381 jclass clazz, |
376 jobject java_web_contents) { | 382 jobject java_web_contents) { |
377 content::WebContents* web_contents = | 383 content::WebContents* web_contents = |
378 content::WebContents::FromJavaWebContents(java_web_contents); | 384 content::WebContents::FromJavaWebContents(java_web_contents); |
379 return web_contents->WasRecentlyAudible(); | 385 return web_contents->WasRecentlyAudible(); |
380 } | 386 } |
OLD | NEW |