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

Side by Side Diff: content/renderer/web_preferences.cc

Issue 292573004: Don't use webmediaplayer to FullscreenController about fullscreen change (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/public/renderer/web_preferences.h" 5 #include "content/public/renderer/web_preferences.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "content/renderer/net_info_helper.h" 8 #include "content/renderer/net_info_helper.h"
9 #include "third_party/WebKit/public/platform/WebConnectionType.h" 9 #include "third_party/WebKit/public/platform/WebConnectionType.h"
10 #include "third_party/WebKit/public/platform/WebString.h" 10 #include "third_party/WebKit/public/platform/WebString.h"
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 287
288 settings->setSelectionIncludesAltImageText(true); 288 settings->setSelectionIncludesAltImageText(true);
289 289
290 #if defined(OS_ANDROID) 290 #if defined(OS_ANDROID)
291 settings->setAllowCustomScrollbarInMainFrame(false); 291 settings->setAllowCustomScrollbarInMainFrame(false);
292 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled); 292 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled);
293 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor); 293 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor);
294 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment); 294 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment);
295 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom); 295 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom);
296 settings->setAutoZoomFocusedNodeToLegibleScale(true); 296 settings->setAutoZoomFocusedNodeToLegibleScale(true);
297 settings->setDisallowFullscreenForNonMediaElements(
298 prefs.disallow_fullscreen_for_non_media_elements);
297 settings->setDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled); 299 settings->setDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled);
298 settings->setMediaControlsOverlayPlayButtonEnabled(true); 300 settings->setMediaControlsOverlayPlayButtonEnabled(true);
299 settings->setMediaPlaybackRequiresUserGesture( 301 settings->setMediaPlaybackRequiresUserGesture(
300 prefs.user_gesture_required_for_media_playback); 302 prefs.user_gesture_required_for_media_playback);
301 settings->setDefaultVideoPosterURL( 303 settings->setDefaultVideoPosterURL(
302 base::ASCIIToUTF16(prefs.default_video_poster_url.spec())); 304 base::ASCIIToUTF16(prefs.default_video_poster_url.spec()));
303 settings->setSupportDeprecatedTargetDensityDPI( 305 settings->setSupportDeprecatedTargetDensityDPI(
304 prefs.support_deprecated_target_density_dpi); 306 prefs.support_deprecated_target_density_dpi);
305 settings->setUseLegacyBackgroundSizeShorthandBehavior( 307 settings->setUseLegacyBackgroundSizeShorthandBehavior(
306 prefs.use_legacy_background_size_shorthand_behavior); 308 prefs.use_legacy_background_size_shorthand_behavior);
(...skipping 24 matching lines...) Expand all
331 settings->setPinchVirtualViewportEnabled( 333 settings->setPinchVirtualViewportEnabled(
332 prefs.pinch_virtual_viewport_enabled); 334 prefs.pinch_virtual_viewport_enabled);
333 335
334 settings->setPinchOverlayScrollbarThickness( 336 settings->setPinchOverlayScrollbarThickness(
335 prefs.pinch_overlay_scrollbar_thickness); 337 prefs.pinch_overlay_scrollbar_thickness);
336 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); 338 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars);
337 settings->setCompositorTouchHitTesting(prefs.compositor_touch_hit_testing); 339 settings->setCompositorTouchHitTesting(prefs.compositor_touch_hit_testing);
338 } 340 }
339 341
340 } // namespace content 342 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.cc ('k') | webkit/common/webpreferences.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698