Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1172)

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 212133003: Stop using the mediaFullscreenRequiresUserGesture setting (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | content/public/common/common_param_traits_macros.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 command_line.HasSwitch(switches::kEnableExperimentalWebSocket); 443 command_line.HasSwitch(switches::kEnableExperimentalWebSocket);
444 if (command_line.HasSwitch(cc::switches::kEnablePinchVirtualViewport)) { 444 if (command_line.HasSwitch(cc::switches::kEnablePinchVirtualViewport)) {
445 prefs.pinch_virtual_viewport_enabled = true; 445 prefs.pinch_virtual_viewport_enabled = true;
446 prefs.pinch_overlay_scrollbar_thickness = 10; 446 prefs.pinch_overlay_scrollbar_thickness = 10;
447 } 447 }
448 prefs.use_solid_color_scrollbars = ui::IsOverlayScrollbarEnabled(); 448 prefs.use_solid_color_scrollbars = ui::IsOverlayScrollbarEnabled();
449 449
450 #if defined(OS_ANDROID) 450 #if defined(OS_ANDROID)
451 prefs.user_gesture_required_for_media_playback = !command_line.HasSwitch( 451 prefs.user_gesture_required_for_media_playback = !command_line.HasSwitch(
452 switches::kDisableGestureRequirementForMediaPlayback); 452 switches::kDisableGestureRequirementForMediaPlayback);
453 prefs.user_gesture_required_for_media_fullscreen = !command_line.HasSwitch(
454 switches::kDisableGestureRequirementForMediaFullscreen);
acolwell GONE FROM CHROMIUM 2014/03/26 17:47:31 Is the plan to remove the kDisableGestureRequireme
philipj_slow 2014/03/26 17:58:04 So this is a bit ugly, but it's still used in Brow
455 #endif 453 #endif
456 454
457 prefs.touch_enabled = ui::AreTouchEventsEnabled(); 455 prefs.touch_enabled = ui::AreTouchEventsEnabled();
458 prefs.device_supports_touch = prefs.touch_enabled && 456 prefs.device_supports_touch = prefs.touch_enabled &&
459 ui::IsTouchDevicePresent(); 457 ui::IsTouchDevicePresent();
460 #if defined(OS_ANDROID) 458 #if defined(OS_ANDROID)
461 prefs.device_supports_mouse = false; 459 prefs.device_supports_mouse = false;
462 #endif 460 #endif
463 461
464 prefs.pointer_events_max_touch_points = ui::MaxTouchPoints(); 462 prefs.pointer_events_max_touch_points = ui::MaxTouchPoints();
(...skipping 1463 matching lines...) Expand 10 before | Expand all | Expand 10 after
1928 return true; 1926 return true;
1929 } 1927 }
1930 1928
1931 void RenderViewHostImpl::AttachToFrameTree() { 1929 void RenderViewHostImpl::AttachToFrameTree() {
1932 FrameTree* frame_tree = delegate_->GetFrameTree(); 1930 FrameTree* frame_tree = delegate_->GetFrameTree();
1933 1931
1934 frame_tree->ResetForMainFrameSwap(); 1932 frame_tree->ResetForMainFrameSwap();
1935 } 1933 }
1936 1934
1937 } // namespace content 1935 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/public/common/common_param_traits_macros.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698