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

Unified Diff: content/browser/android/content_settings.cc

Issue 12217134: [Android WebView] Implement WebSettings.{get|set}LoadWithOverviewMode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Corrections after the WebKit patch 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/android/content_settings.cc
diff --git a/content/browser/android/content_settings.cc b/content/browser/android/content_settings.cc
index cd61c4124304848fd428ad2dc17cec57fbb50b67..8431987241203a44a2d3c37136d304a6cbf3cee1 100644
--- a/content/browser/android/content_settings.cc
+++ b/content/browser/android/content_settings.cc
@@ -82,6 +82,8 @@ struct ContentSettings::FieldIds {
GetFieldID(env, clazz, "mDomStorageEnabled", "Z");
use_wide_viewport =
GetFieldID(env, clazz, "mUseWideViewport", "Z");
+ load_with_overview_mode =
+ GetFieldID(env, clazz, "mLoadWithOverviewMode", "Z");
}
// Field ids
@@ -107,6 +109,7 @@ struct ContentSettings::FieldIds {
jfieldID support_multiple_windows;
jfieldID dom_storage_enabled;
jfieldID use_wide_viewport;
+ jfieldID load_with_overview_mode;
};
ContentSettings::ContentSettings(JNIEnv* env,
@@ -266,6 +269,12 @@ void ContentSettings::SyncFromNativeImpl() {
field_ids_->use_wide_viewport,
prefs.viewport_enabled);
CheckException(env);
+
+ env->SetBooleanField(
+ obj,
+ field_ids_->load_with_overview_mode,
+ prefs.initialize_at_minimum_page_scale);
+ CheckException(env);
}
void ContentSettings::SyncToNativeImpl() {
@@ -373,6 +382,9 @@ void ContentSettings::SyncToNativeImpl() {
prefs.viewport_enabled = env->GetBooleanField(
obj, field_ids_->use_wide_viewport);
+ prefs.initialize_at_minimum_page_scale = env->GetBooleanField(
+ obj, field_ids_->load_with_overview_mode);
+
render_view_host->UpdateWebkitPreferences(prefs);
}

Powered by Google App Engine
This is Rietveld 408576698