| 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..76294fb21d01b722e4b4afcb9ee3a8f69b9c0ac9 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.viewport_scale_content_to_fit);
|
| + CheckException(env);
|
| }
|
|
|
| void ContentSettings::SyncToNativeImpl() {
|
| @@ -373,6 +382,9 @@ void ContentSettings::SyncToNativeImpl() {
|
| prefs.viewport_enabled = env->GetBooleanField(
|
| obj, field_ids_->use_wide_viewport);
|
|
|
| + prefs.viewport_scale_content_to_fit = env->GetBooleanField(
|
| + obj, field_ids_->load_with_overview_mode);
|
| +
|
| render_view_host->UpdateWebkitPreferences(prefs);
|
| }
|
|
|
|
|