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 "content/browser/renderer_host/render_view_host_impl.h" | 5 #include "content/browser/renderer_host/render_view_host_impl.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
475 // On Android, user gestures are normally required, unless that requirement | 475 // On Android, user gestures are normally required, unless that requirement |
476 // is disabled with a command-line switch or the equivalent field trial is | 476 // is disabled with a command-line switch or the equivalent field trial is |
477 // is set to "Enabled". | 477 // is set to "Enabled". |
478 const std::string autoplay_group_name = base::FieldTrialList::FindFullName( | 478 const std::string autoplay_group_name = base::FieldTrialList::FindFullName( |
479 "MediaElementAutoplay"); | 479 "MediaElementAutoplay"); |
480 prefs.user_gesture_required_for_media_playback = !command_line.HasSwitch( | 480 prefs.user_gesture_required_for_media_playback = !command_line.HasSwitch( |
481 switches::kDisableGestureRequirementForMediaPlayback) && | 481 switches::kDisableGestureRequirementForMediaPlayback) && |
482 (autoplay_group_name.empty() || autoplay_group_name != "Enabled"); | 482 (autoplay_group_name.empty() || autoplay_group_name != "Enabled"); |
483 prefs.autoplay_muted_videos_enabled = command_line.HasSwitch( | 483 prefs.autoplay_muted_videos_enabled = command_line.HasSwitch( |
484 switches::kEnableAutoplayMutedVideos); | 484 switches::kEnableAutoplayMutedVideos); |
| 485 |
| 486 prefs.progress_bar_completion = GetProgressBarCompletionPolicy(); |
485 #endif | 487 #endif |
486 | 488 |
487 // Handle autoplay gesture override experiment. | 489 // Handle autoplay gesture override experiment. |
488 // Note that anything but a well-formed string turns the experiment off. | 490 // Note that anything but a well-formed string turns the experiment off. |
489 prefs.autoplay_experiment_mode = base::FieldTrialList::FindFullName( | 491 prefs.autoplay_experiment_mode = base::FieldTrialList::FindFullName( |
490 "MediaElementGestureOverrideExperiment"); | 492 "MediaElementGestureOverrideExperiment"); |
491 | 493 |
492 prefs.touch_enabled = ui::AreTouchEventsEnabled(); | 494 prefs.touch_enabled = ui::AreTouchEventsEnabled(); |
493 prefs.device_supports_touch = prefs.touch_enabled && | 495 prefs.device_supports_touch = prefs.touch_enabled && |
494 ui::GetTouchScreensAvailability() == | 496 ui::GetTouchScreensAvailability() == |
(...skipping 827 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1322 // Note: We are using the origin URL provided by the sender here. It may be | 1324 // Note: We are using the origin URL provided by the sender here. It may be |
1323 // different from the receiver's. | 1325 // different from the receiver's. |
1324 file_system_file.url = | 1326 file_system_file.url = |
1325 GURL(storage::GetIsolatedFileSystemRootURIString( | 1327 GURL(storage::GetIsolatedFileSystemRootURIString( |
1326 file_system_url.origin(), filesystem_id, std::string()) | 1328 file_system_url.origin(), filesystem_id, std::string()) |
1327 .append(register_name)); | 1329 .append(register_name)); |
1328 } | 1330 } |
1329 } | 1331 } |
1330 | 1332 |
1331 } // namespace content | 1333 } // namespace content |
OLD | NEW |