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 "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "components/google/core/browser/google_util.h" | 8 #include "components/google/core/browser/google_util.h" |
9 #include "content/public/browser/render_view_host.h" | 9 #include "content/public/browser/render_view_host.h" |
10 #include "content/public/browser/web_contents.h" | 10 #include "content/public/browser/web_contents.h" |
11 #include "content/public/common/content_switches.h" | 11 #include "content/public/common/content_switches.h" |
12 #include "content/public/common/web_preferences.h" | 12 #include "content/public/common/web_preferences.h" |
13 #include "jni/VoiceSearchTabHelper_jni.h" | 13 #include "jni/VoiceSearchTabHelper_jni.h" |
14 | 14 |
15 using content::WebContents; | 15 using content::WebContents; |
16 | 16 |
17 // Register native methods | 17 // Register native methods |
18 bool RegisterVoiceSearchTabHelper(JNIEnv* env) { | 18 bool RegisterVoiceSearchTabHelper(JNIEnv* env) { |
19 return RegisterNativesImpl(env); | 19 return RegisterNativesImpl(env); |
20 } | 20 } |
21 | 21 |
22 static void UpdateAutoplayStatus(JNIEnv* env, | 22 static void UpdateAutoplayStatus(JNIEnv* env, |
23 jobject obj, | 23 jobject obj, |
24 jobject j_web_contents) { | 24 jobject j_web_contents) { |
25 // In the case where media autoplay has been disabled by default (e.g. in | 25 // In the case where media autoplay has been disabled by default (e.g. in |
26 // performance media tests) do not update it based on navigation changes. | 26 // performance media tests) do not update it based on navigation changes. |
27 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 27 const base::CommandLine& command_line = |
| 28 *base::CommandLine::ForCurrentProcess(); |
28 if (command_line.HasSwitch( | 29 if (command_line.HasSwitch( |
29 switches::kDisableGestureRequirementForMediaPlayback)) | 30 switches::kDisableGestureRequirementForMediaPlayback)) |
30 return; | 31 return; |
31 | 32 |
32 WebContents* web_contents = WebContents::FromJavaWebContents(j_web_contents); | 33 WebContents* web_contents = WebContents::FromJavaWebContents(j_web_contents); |
33 content::RenderViewHost* host = web_contents->GetRenderViewHost(); | 34 content::RenderViewHost* host = web_contents->GetRenderViewHost(); |
34 content::WebPreferences prefs = host->GetWebkitPreferences(); | 35 content::WebPreferences prefs = host->GetWebkitPreferences(); |
35 | 36 |
36 bool gesture_required = | 37 bool gesture_required = |
37 !google_util::IsGoogleSearchUrl(web_contents->GetLastCommittedURL()); | 38 !google_util::IsGoogleSearchUrl(web_contents->GetLastCommittedURL()); |
38 | 39 |
39 if (gesture_required != prefs.user_gesture_required_for_media_playback) { | 40 if (gesture_required != prefs.user_gesture_required_for_media_playback) { |
40 // TODO(chrishtr): this is wrong. user_gesture_required_for_media_playback | 41 // TODO(chrishtr): this is wrong. user_gesture_required_for_media_playback |
41 // will be reset the next time a preference changes. | 42 // will be reset the next time a preference changes. |
42 prefs.user_gesture_required_for_media_playback = | 43 prefs.user_gesture_required_for_media_playback = |
43 !google_util::IsGoogleSearchUrl(web_contents->GetLastCommittedURL()); | 44 !google_util::IsGoogleSearchUrl(web_contents->GetLastCommittedURL()); |
44 host->UpdateWebkitPreferences(prefs); | 45 host->UpdateWebkitPreferences(prefs); |
45 } | 46 } |
46 } | 47 } |
OLD | NEW |