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

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

Issue 11416027: Disable custom scrollbar in main frame for Android (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « no previous file | no next file » | 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 "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 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 430
431 settings->setFixedPositionCreatesStackingContext( 431 settings->setFixedPositionCreatesStackingContext(
432 fixed_position_creates_stacking_context); 432 fixed_position_creates_stacking_context);
433 433
434 settings->setApplyPageScaleFactorInCompositor( 434 settings->setApplyPageScaleFactorInCompositor(
435 apply_page_scale_factor_in_compositor); 435 apply_page_scale_factor_in_compositor);
436 436
437 settings->setDeferredImageDecodingEnabled(deferred_image_decoding_enabled); 437 settings->setDeferredImageDecodingEnabled(deferred_image_decoding_enabled);
438 438
439 #if defined(OS_ANDROID) 439 #if defined(OS_ANDROID)
440 settings->setAllowCustomScrollbarInMainFrame(false);
440 settings->setTextAutosizingEnabled(text_autosizing_enabled); 441 settings->setTextAutosizingEnabled(text_autosizing_enabled);
441 settings->setTextAutosizingFontScaleFactor(font_scale_factor); 442 settings->setTextAutosizingFontScaleFactor(font_scale_factor);
442 web_view->setIgnoreViewportTagMaximumScale(force_enable_zoom); 443 web_view->setIgnoreViewportTagMaximumScale(force_enable_zoom);
443 settings->setAutoZoomFocusedNodeToLegibleScale(true); 444 settings->setAutoZoomFocusedNodeToLegibleScale(true);
444 settings->setDoubleTapToZoomEnabled(true); 445 settings->setDoubleTapToZoomEnabled(true);
445 settings->setMediaPlaybackRequiresUserGesture( 446 settings->setMediaPlaybackRequiresUserGesture(
446 user_gesture_required_for_media_playback); 447 user_gesture_required_for_media_playback);
447 settings->setSupportsMultipleWindows(supports_multiple_windows); 448 settings->setSupportsMultipleWindows(supports_multiple_windows);
448 #endif 449 #endif
449 450
450 WebNetworkStateNotifier::setOnLine(is_online); 451 WebNetworkStateNotifier::setOnLine(is_online);
451 } 452 }
452 453
453 } // namespace webkit_glue 454 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698