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

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

Issue 12217134: [Android WebView] Implement WebSettings.{get|set}LoadWithOverviewMode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed typo in comment Created 7 years, 10 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 (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/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" 10 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 editing_behavior(EDITING_BEHAVIOR_WIN), 136 editing_behavior(EDITING_BEHAVIOR_WIN),
137 #elif defined(OS_ANDROID) 137 #elif defined(OS_ANDROID)
138 editing_behavior(EDITING_BEHAVIOR_ANDROID), 138 editing_behavior(EDITING_BEHAVIOR_ANDROID),
139 #elif defined(OS_POSIX) 139 #elif defined(OS_POSIX)
140 editing_behavior(EDITING_BEHAVIOR_UNIX), 140 editing_behavior(EDITING_BEHAVIOR_UNIX),
141 #else 141 #else
142 editing_behavior(EDITING_BEHAVIOR_MAC), 142 editing_behavior(EDITING_BEHAVIOR_MAC),
143 #endif 143 #endif
144 supports_multiple_windows(true), 144 supports_multiple_windows(true),
145 viewport_enabled(false), 145 viewport_enabled(false),
146 initialize_at_minimum_page_scale(true),
jamesr 2013/02/19 23:26:21 this defaults to true, but in java it looks like C
mnaganov (inactive) 2013/02/20 10:36:49 ContentSettings defaults are used for Android WebV
146 record_rendering_stats(false), 147 record_rendering_stats(false),
147 cookie_enabled(true) 148 cookie_enabled(true)
148 #if defined(OS_ANDROID) 149 #if defined(OS_ANDROID)
149 , 150 ,
150 text_autosizing_enabled(true), 151 text_autosizing_enabled(true),
151 font_scale_factor(1.0f), 152 font_scale_factor(1.0f),
152 force_enable_zoom(false), 153 force_enable_zoom(false),
153 user_gesture_required_for_media_playback(true) 154 user_gesture_required_for_media_playback(true)
154 #endif 155 #endif
155 { 156 {
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 settings->setDeferredImageDecodingEnabled(deferred_image_decoding_enabled); 480 settings->setDeferredImageDecodingEnabled(deferred_image_decoding_enabled);
480 settings->setShouldRespectImageOrientation(should_respect_image_orientation); 481 settings->setShouldRespectImageOrientation(should_respect_image_orientation);
481 482
482 settings->setUnsafePluginPastingEnabled(false); 483 settings->setUnsafePluginPastingEnabled(false);
483 settings->setEditingBehavior( 484 settings->setEditingBehavior(
484 static_cast<WebSettings::EditingBehavior>(editing_behavior)); 485 static_cast<WebSettings::EditingBehavior>(editing_behavior));
485 486
486 settings->setSupportsMultipleWindows(supports_multiple_windows); 487 settings->setSupportsMultipleWindows(supports_multiple_windows);
487 488
488 settings->setViewportEnabled(viewport_enabled); 489 settings->setViewportEnabled(viewport_enabled);
490 settings->setInitializeAtMinimumPageScale(initialize_at_minimum_page_scale);
489 491
490 #if defined(OS_ANDROID) 492 #if defined(OS_ANDROID)
491 settings->setAllowCustomScrollbarInMainFrame(false); 493 settings->setAllowCustomScrollbarInMainFrame(false);
492 settings->setTextAutosizingEnabled(text_autosizing_enabled); 494 settings->setTextAutosizingEnabled(text_autosizing_enabled);
493 settings->setTextAutosizingFontScaleFactor(font_scale_factor); 495 settings->setTextAutosizingFontScaleFactor(font_scale_factor);
494 web_view->setIgnoreViewportTagMaximumScale(force_enable_zoom); 496 web_view->setIgnoreViewportTagMaximumScale(force_enable_zoom);
495 settings->setAutoZoomFocusedNodeToLegibleScale(true); 497 settings->setAutoZoomFocusedNodeToLegibleScale(true);
496 settings->setDoubleTapToZoomEnabled(true); 498 settings->setDoubleTapToZoomEnabled(true);
497 settings->setMediaPlaybackRequiresUserGesture( 499 settings->setMediaPlaybackRequiresUserGesture(
498 user_gesture_required_for_media_playback); 500 user_gesture_required_for_media_playback);
(...skipping 11 matching lines...) Expand all
510 WebPreferences::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac); 512 WebPreferences::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac);
511 COMPILE_ASSERT_MATCHING_ENUMS( 513 COMPILE_ASSERT_MATCHING_ENUMS(
512 WebPreferences::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin); 514 WebPreferences::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin);
513 COMPILE_ASSERT_MATCHING_ENUMS( 515 COMPILE_ASSERT_MATCHING_ENUMS(
514 WebPreferences::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix); 516 WebPreferences::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix);
515 COMPILE_ASSERT_MATCHING_ENUMS( 517 COMPILE_ASSERT_MATCHING_ENUMS(
516 WebPreferences::EDITING_BEHAVIOR_ANDROID, 518 WebPreferences::EDITING_BEHAVIOR_ANDROID,
517 WebSettings::EditingBehaviorAndroid); 519 WebSettings::EditingBehaviorAndroid);
518 520
519 } // namespace webkit_glue 521 } // 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