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

Side by Side Diff: webkit/glue/webpreferences.cc

Issue 11192057: [Android] Add supportMultipleWindows setting (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updated to match the committed version of the WebKit part Created 8 years, 1 month 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 (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 "webkit/glue/webpreferences.h" 5 #include "webkit/glue/webpreferences.h"
6 6
7 #include "base/string_util.h" 7 #include "base/string_util.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifi er.h" 9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifi er.h"
10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 accelerated_plugins_enabled(false), 97 accelerated_plugins_enabled(false),
98 memory_info_enabled(false), 98 memory_info_enabled(false),
99 fullscreen_enabled(false), 99 fullscreen_enabled(false),
100 allow_displaying_insecure_content(true), 100 allow_displaying_insecure_content(true),
101 allow_running_insecure_content(false), 101 allow_running_insecure_content(false),
102 #if defined(OS_ANDROID) 102 #if defined(OS_ANDROID)
103 text_autosizing_enabled(true), 103 text_autosizing_enabled(true),
104 font_scale_factor(1.0f), 104 font_scale_factor(1.0f),
105 force_enable_zoom(false), 105 force_enable_zoom(false),
106 user_gesture_required_for_media_playback(true), 106 user_gesture_required_for_media_playback(true),
107 supports_multiple_windows(true),
107 #endif 108 #endif
108 password_echo_enabled(false), 109 password_echo_enabled(false),
109 should_print_backgrounds(false), 110 should_print_backgrounds(false),
110 enable_scroll_animator(false), 111 enable_scroll_animator(false),
111 visual_word_movement_enabled(false), 112 visual_word_movement_enabled(false),
112 css_sticky_position_enabled(false), 113 css_sticky_position_enabled(false),
113 css_regions_enabled(false), 114 css_regions_enabled(false),
114 css_shaders_enabled(false), 115 css_shaders_enabled(false),
115 css_variables_enabled(false), 116 css_variables_enabled(false),
116 device_supports_touch(false), 117 device_supports_touch(false),
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 settings->setAllowDisplayOfInsecureContent(allow_displaying_insecure_content); 411 settings->setAllowDisplayOfInsecureContent(allow_displaying_insecure_content);
411 settings->setAllowRunningOfInsecureContent(allow_running_insecure_content); 412 settings->setAllowRunningOfInsecureContent(allow_running_insecure_content);
412 #if defined(OS_ANDROID) 413 #if defined(OS_ANDROID)
413 settings->setTextAutosizingEnabled(text_autosizing_enabled); 414 settings->setTextAutosizingEnabled(text_autosizing_enabled);
414 settings->setTextAutosizingFontScaleFactor(font_scale_factor); 415 settings->setTextAutosizingFontScaleFactor(font_scale_factor);
415 web_view->setIgnoreViewportTagMaximumScale(force_enable_zoom); 416 web_view->setIgnoreViewportTagMaximumScale(force_enable_zoom);
416 settings->setAutoZoomFocusedNodeToLegibleScale(true); 417 settings->setAutoZoomFocusedNodeToLegibleScale(true);
417 settings->setDoubleTapToZoomEnabled(true); 418 settings->setDoubleTapToZoomEnabled(true);
418 settings->setMediaPlaybackRequiresUserGesture( 419 settings->setMediaPlaybackRequiresUserGesture(
419 user_gesture_required_for_media_playback); 420 user_gesture_required_for_media_playback);
421 settings->setSupportsMultipleWindows(supports_multiple_windows);
420 #endif 422 #endif
421 settings->setPasswordEchoEnabled(password_echo_enabled); 423 settings->setPasswordEchoEnabled(password_echo_enabled);
422 settings->setShouldPrintBackgrounds(should_print_backgrounds); 424 settings->setShouldPrintBackgrounds(should_print_backgrounds);
423 settings->setEnableScrollAnimator(enable_scroll_animator); 425 settings->setEnableScrollAnimator(enable_scroll_animator);
424 settings->setVisualWordMovementEnabled(visual_word_movement_enabled); 426 settings->setVisualWordMovementEnabled(visual_word_movement_enabled);
425 427
426 settings->setCSSStickyPositionEnabled(css_sticky_position_enabled); 428 settings->setCSSStickyPositionEnabled(css_sticky_position_enabled);
427 settings->setExperimentalCSSRegionsEnabled(css_regions_enabled); 429 settings->setExperimentalCSSRegionsEnabled(css_regions_enabled);
428 settings->setExperimentalCSSCustomFilterEnabled(css_shaders_enabled); 430 settings->setExperimentalCSSCustomFilterEnabled(css_shaders_enabled);
429 settings->setExperimentalCSSVariablesEnabled(css_variables_enabled); 431 settings->setExperimentalCSSVariablesEnabled(css_variables_enabled);
430 432
431 settings->setDeviceSupportsTouch(device_supports_touch); 433 settings->setDeviceSupportsTouch(device_supports_touch);
432 settings->setDeviceSupportsMouse(device_supports_mouse); 434 settings->setDeviceSupportsMouse(device_supports_mouse);
433 435
434 settings->setDefaultTileSize( 436 settings->setDefaultTileSize(
435 WebSize(default_tile_width, default_tile_height)); 437 WebSize(default_tile_width, default_tile_height));
436 settings->setMaxUntiledLayerSize( 438 settings->setMaxUntiledLayerSize(
437 WebSize(max_untiled_layer_width, max_untiled_layer_height)); 439 WebSize(max_untiled_layer_width, max_untiled_layer_height));
438 440
439 settings->setFixedPositionCreatesStackingContext( 441 settings->setFixedPositionCreatesStackingContext(
440 fixed_position_creates_stacking_context); 442 fixed_position_creates_stacking_context);
441 443
442 settings->setApplyPageScaleFactorInCompositor( 444 settings->setApplyPageScaleFactorInCompositor(
443 apply_page_scale_factor_in_compositor); 445 apply_page_scale_factor_in_compositor);
444 446
445 WebNetworkStateNotifier::setOnLine(is_online); 447 WebNetworkStateNotifier::setOnLine(is_online);
446 } 448 }
447 449
448 } // namespace webkit_glue 450 } // namespace webkit_glue
OLDNEW
« content/renderer/render_view_impl.cc ('K') | « webkit/glue/webpreferences.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698