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

Side by Side Diff: content/browser/android/content_settings.cc

Issue 14234002: [Android WebView] Never turn off viewport and fixed layout (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Jonathan's comment addressed Created 7 years, 8 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 "content/browser/android/content_settings.h" 5 #include "content/browser/android/content_settings.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "content/browser/android/content_view_core_impl.h" 9 #include "content/browser/android/content_view_core_impl.h"
10 #include "content/browser/renderer_host/render_view_host_delegate.h" 10 #include "content/browser/renderer_host/render_view_host_delegate.h"
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 278
279 env->SetBooleanField( 279 env->SetBooleanField(
280 obj, 280 obj,
281 field_ids_->database_enabled, 281 field_ids_->database_enabled,
282 prefs.databases_enabled); 282 prefs.databases_enabled);
283 CheckException(env); 283 CheckException(env);
284 284
285 env->SetBooleanField( 285 env->SetBooleanField(
286 obj, 286 obj,
287 field_ids_->use_wide_viewport, 287 field_ids_->use_wide_viewport,
288 prefs.viewport_enabled); 288 prefs.use_wide_viewport);
289 CheckException(env); 289 CheckException(env);
290 290
291 env->SetBooleanField( 291 env->SetBooleanField(
292 obj, 292 obj,
293 field_ids_->load_with_overview_mode, 293 field_ids_->load_with_overview_mode,
294 prefs.initialize_at_minimum_page_scale); 294 prefs.initialize_at_minimum_page_scale);
295 CheckException(env); 295 CheckException(env);
296 296
297 env->SetBooleanField( 297 env->SetBooleanField(
298 obj, 298 obj,
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 408
409 prefs.application_cache_enabled = 409 prefs.application_cache_enabled =
410 Java_ContentSettings_getAppCacheEnabled(env, obj); 410 Java_ContentSettings_getAppCacheEnabled(env, obj);
411 411
412 prefs.local_storage_enabled = env->GetBooleanField( 412 prefs.local_storage_enabled = env->GetBooleanField(
413 obj, field_ids_->dom_storage_enabled); 413 obj, field_ids_->dom_storage_enabled);
414 414
415 prefs.databases_enabled = env->GetBooleanField( 415 prefs.databases_enabled = env->GetBooleanField(
416 obj, field_ids_->database_enabled); 416 obj, field_ids_->database_enabled);
417 417
418 prefs.viewport_enabled = env->GetBooleanField( 418 prefs.double_tap_to_zoom_enabled = prefs.use_wide_viewport =
419 obj, field_ids_->use_wide_viewport); 419 env->GetBooleanField(obj, field_ids_->use_wide_viewport);
420 prefs.double_tap_to_zoom_enabled = prefs.viewport_enabled;
421 420
422 prefs.initialize_at_minimum_page_scale = env->GetBooleanField( 421 prefs.initialize_at_minimum_page_scale = env->GetBooleanField(
423 obj, field_ids_->load_with_overview_mode); 422 obj, field_ids_->load_with_overview_mode);
424 423
425 prefs.user_gesture_required_for_media_playback = env->GetBooleanField( 424 prefs.user_gesture_required_for_media_playback = env->GetBooleanField(
426 obj, field_ids_->media_playback_requires_user_gesture); 425 obj, field_ids_->media_playback_requires_user_gesture);
427 426
428 str.Reset( 427 str.Reset(
429 env, static_cast<jstring>( 428 env, static_cast<jstring>(
430 env->GetObjectField(obj, field_ids_->default_video_poster_url))); 429 env->GetObjectField(obj, field_ids_->default_video_poster_url)));
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 new ContentSettings(env, obj, web_contents, is_master_mode); 462 new ContentSettings(env, obj, web_contents, is_master_mode);
464 return reinterpret_cast<jint>(content_settings); 463 return reinterpret_cast<jint>(content_settings);
465 } 464 }
466 465
467 static jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) { 466 static jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) {
468 return base::android::ConvertUTF8ToJavaString( 467 return base::android::ConvertUTF8ToJavaString(
469 env, GetContentClient()->GetUserAgent()).Release(); 468 env, GetContentClient()->GetUserAgent()).Release();
470 } 469 }
471 470
472 } // namespace content 471 } // namespace content
OLDNEW
« no previous file with comments | « android_webview/renderer/aw_render_view_ext.cc ('k') | content/public/common/common_param_traits_macros.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698