OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/voice_search_tab_helper.h" | 5 #include "chrome/browser/android/voice_search_tab_helper.h" |
6 | 6 |
7 #include "components/google/core/browser/google_util.h" | 7 #include "components/google/core/browser/google_util.h" |
8 #include "content/public/browser/render_view_host.h" | 8 #include "content/public/browser/render_view_host.h" |
9 #include "content/public/browser/web_contents.h" | 9 #include "content/public/browser/web_contents.h" |
| 10 #include "content/public/common/web_preferences.h" |
10 #include "jni/VoiceSearchTabHelper_jni.h" | 11 #include "jni/VoiceSearchTabHelper_jni.h" |
11 #include "webkit/common/webpreferences.h" | |
12 | 12 |
13 using content::WebContents; | 13 using content::WebContents; |
14 | 14 |
15 // Register native methods | 15 // Register native methods |
16 bool RegisterVoiceSearchTabHelper(JNIEnv* env) { | 16 bool RegisterVoiceSearchTabHelper(JNIEnv* env) { |
17 return RegisterNativesImpl(env); | 17 return RegisterNativesImpl(env); |
18 } | 18 } |
19 | 19 |
20 static void UpdateAutoplayStatus(JNIEnv* env, | 20 static void UpdateAutoplayStatus(JNIEnv* env, |
21 jobject obj, | 21 jobject obj, |
22 jobject j_web_contents) { | 22 jobject j_web_contents) { |
23 WebContents* web_contents = WebContents::FromJavaWebContents(j_web_contents); | 23 WebContents* web_contents = WebContents::FromJavaWebContents(j_web_contents); |
24 content::RenderViewHost* host = web_contents->GetRenderViewHost(); | 24 content::RenderViewHost* host = web_contents->GetRenderViewHost(); |
25 WebPreferences prefs = host->GetWebkitPreferences(); | 25 content::WebPreferences prefs = host->GetWebkitPreferences(); |
26 | 26 |
27 // In the case where media autoplay has been enabled by default (e.g. in | 27 // In the case where media autoplay has been enabled by default (e.g. in |
28 // performance media tests) do not update it based on navigation changes. | 28 // performance media tests) do not update it based on navigation changes. |
29 // | 29 // |
30 // Note that GetWekitPreferences() is 'stateless'. It returns the default | 30 // Note that GetWekitPreferences() is 'stateless'. It returns the default |
31 // webkit preferences configuration from command line switches. | 31 // webkit preferences configuration from command line switches. |
32 if (!prefs.user_gesture_required_for_media_playback) | 32 if (!prefs.user_gesture_required_for_media_playback) |
33 return; | 33 return; |
34 | 34 |
35 prefs.user_gesture_required_for_media_playback = | 35 prefs.user_gesture_required_for_media_playback = |
36 !google_util::IsGoogleSearchUrl(web_contents->GetLastCommittedURL()); | 36 !google_util::IsGoogleSearchUrl(web_contents->GetLastCommittedURL()); |
37 host->UpdateWebkitPreferences(prefs); | 37 host->UpdateWebkitPreferences(prefs); |
38 } | 38 } |
OLD | NEW |