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

Side by Side Diff: android_webview/native/aw_settings.cc

Issue 144923002: [Android WebView] Inform ContentViewCore about double tap support status (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed assert in the Java getter Created 6 years, 11 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "android_webview/native/aw_settings.h" 5 #include "android_webview/native/aw_settings.h"
6 6
7 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h" 7 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
8 #include "android_webview/native/aw_contents.h" 8 #include "android_webview/native/aw_contents.h"
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 web_prefs->application_cache_enabled = 280 web_prefs->application_cache_enabled =
281 Java_AwSettings_getAppCacheEnabledLocked(env, obj); 281 Java_AwSettings_getAppCacheEnabledLocked(env, obj);
282 282
283 web_prefs->local_storage_enabled = 283 web_prefs->local_storage_enabled =
284 Java_AwSettings_getDomStorageEnabledLocked(env, obj); 284 Java_AwSettings_getDomStorageEnabledLocked(env, obj);
285 285
286 web_prefs->databases_enabled = 286 web_prefs->databases_enabled =
287 Java_AwSettings_getDatabaseEnabledLocked(env, obj); 287 Java_AwSettings_getDatabaseEnabledLocked(env, obj);
288 288
289 web_prefs->wide_viewport_quirk = true; 289 web_prefs->wide_viewport_quirk = true;
290 web_prefs->double_tap_to_zoom_enabled = web_prefs->use_wide_viewport = 290 web_prefs->use_wide_viewport =
291 Java_AwSettings_getUseWideViewportLocked(env, obj); 291 Java_AwSettings_getUseWideViewportLocked(env, obj);
292 292
293 web_prefs->double_tap_to_zoom_enabled =
294 Java_AwSettings_supportsDoubleTapZoomLocked(env, obj);
295
293 web_prefs->initialize_at_minimum_page_scale = 296 web_prefs->initialize_at_minimum_page_scale =
294 Java_AwSettings_getLoadWithOverviewModeLocked(env, obj); 297 Java_AwSettings_getLoadWithOverviewModeLocked(env, obj);
295 298
296 web_prefs->user_gesture_required_for_media_playback = 299 web_prefs->user_gesture_required_for_media_playback =
297 Java_AwSettings_getMediaPlaybackRequiresUserGestureLocked(env, obj); 300 Java_AwSettings_getMediaPlaybackRequiresUserGestureLocked(env, obj);
298 301
299 ScopedJavaLocalRef<jstring> url = 302 ScopedJavaLocalRef<jstring> url =
300 Java_AwSettings_getDefaultVideoPosterURLLocked(env, obj); 303 Java_AwSettings_getDefaultVideoPosterURLLocked(env, obj);
301 web_prefs->default_video_poster_url = url.obj() ? 304 web_prefs->default_video_poster_url = url.obj() ?
302 GURL(ConvertJavaStringToUTF8(url)) : GURL(); 305 GURL(ConvertJavaStringToUTF8(url)) : GURL();
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 static jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) { 337 static jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) {
335 return base::android::ConvertUTF8ToJavaString( 338 return base::android::ConvertUTF8ToJavaString(
336 env, content::GetUserAgent(GURL())).Release(); 339 env, content::GetUserAgent(GURL())).Release();
337 } 340 }
338 341
339 bool RegisterAwSettings(JNIEnv* env) { 342 bool RegisterAwSettings(JNIEnv* env) {
340 return RegisterNativesImpl(env) >= 0; 343 return RegisterNativesImpl(env) >= 0;
341 } 344 }
342 345
343 } // namespace android_webview 346 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698