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/web_preferences.h" | 12 #include "content/public/common/web_preferences.h" |
12 #include "media/base/media_switches.h" | |
13 | 13 |
14 DEFINE_WEB_CONTENTS_USER_DATA_KEY(VoiceSearchTabHelper); | 14 DEFINE_WEB_CONTENTS_USER_DATA_KEY(VoiceSearchTabHelper); |
15 | 15 |
16 // TODO(715588): this class shouldn't be playing with the user gesture | |
17 // requirements like this. | |
18 VoiceSearchTabHelper::VoiceSearchTabHelper(content::WebContents* contents) | 16 VoiceSearchTabHelper::VoiceSearchTabHelper(content::WebContents* contents) |
19 : content::WebContentsObserver(contents) { | 17 : content::WebContentsObserver(contents) { |
20 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); | |
21 gesture_requirement_for_playback_disabled_ = | 18 gesture_requirement_for_playback_disabled_ = |
22 command_line->HasSwitch(switches::kIgnoreAutoplayRestrictionsForTests) || | 19 base::CommandLine::ForCurrentProcess()->HasSwitch( |
23 command_line->GetSwitchValueASCII(switches::kAutoplayPolicy) != | 20 switches::kDisableGestureRequirementForMediaPlayback); |
24 switches::autoplay::kNoUserGestureRequiredPolicy; | |
25 } | 21 } |
26 | 22 |
27 VoiceSearchTabHelper::~VoiceSearchTabHelper() { | 23 VoiceSearchTabHelper::~VoiceSearchTabHelper() { |
28 } | 24 } |
29 | 25 |
30 void VoiceSearchTabHelper::NavigationEntryCommitted( | 26 void VoiceSearchTabHelper::NavigationEntryCommitted( |
31 const content::LoadCommittedDetails& load_details) { | 27 const content::LoadCommittedDetails& load_details) { |
32 // In the case where media autoplay has been disabled by default (e.g. in | 28 // In the case where media autoplay has been disabled by default (e.g. in |
33 // performance media tests) do not update it based on navigation changes. | 29 // performance media tests) do not update it based on navigation changes. |
34 if (gesture_requirement_for_playback_disabled_) | 30 if (gesture_requirement_for_playback_disabled_) |
35 return; | 31 return; |
36 | 32 |
37 content::RenderViewHost* host = web_contents()->GetRenderViewHost(); | 33 content::RenderViewHost* host = web_contents()->GetRenderViewHost(); |
38 content::WebPreferences prefs = host->GetWebkitPreferences(); | 34 content::WebPreferences prefs = host->GetWebkitPreferences(); |
39 | 35 |
40 bool gesture_required = | 36 bool gesture_required = |
41 !google_util::IsGoogleSearchUrl(web_contents()->GetLastCommittedURL()); | 37 !google_util::IsGoogleSearchUrl(web_contents()->GetLastCommittedURL()); |
42 | 38 |
43 if (gesture_required != prefs.user_gesture_required_for_media_playback) { | 39 if (gesture_required != prefs.user_gesture_required_for_media_playback) { |
44 // TODO(chrishtr): this is wrong. user_gesture_required_for_media_playback | 40 // TODO(chrishtr): this is wrong. user_gesture_required_for_media_playback |
45 // will be reset the next time a preference changes. | 41 // will be reset the next time a preference changes. |
46 prefs.user_gesture_required_for_media_playback = gesture_required; | 42 prefs.user_gesture_required_for_media_playback = gesture_required; |
47 host->UpdateWebkitPreferences(prefs); | 43 host->UpdateWebkitPreferences(prefs); |
48 } | 44 } |
49 } | 45 } |
OLD | NEW |