| OLD | NEW | 
|---|
| 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/aw_content_browser_client.h" | 7 #include "android_webview/browser/aw_content_browser_client.h" | 
| 8 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h" | 8 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h" | 
| 9 #include "android_webview/common/aw_content_client.h" | 9 #include "android_webview/common/aw_content_client.h" | 
| 10 #include "android_webview/native/aw_contents.h" | 10 #include "android_webview/native/aw_contents.h" | 
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 42   prefs->use_subpixel_positioning = params.subpixel_positioning; | 42   prefs->use_subpixel_positioning = params.subpixel_positioning; | 
| 43   prefs->hinting = params.hinting; | 43   prefs->hinting = params.hinting; | 
| 44   prefs->use_autohinter = params.autohinter; | 44   prefs->use_autohinter = params.autohinter; | 
| 45   prefs->use_bitmaps = params.use_bitmaps; | 45   prefs->use_bitmaps = params.use_bitmaps; | 
| 46   prefs->subpixel_rendering = params.subpixel_rendering; | 46   prefs->subpixel_rendering = params.subpixel_rendering; | 
| 47 } | 47 } | 
| 48 | 48 | 
| 49 void PopulateFixedWebPreferences(WebPreferences* web_prefs) { | 49 void PopulateFixedWebPreferences(WebPreferences* web_prefs) { | 
| 50   web_prefs->shrinks_standalone_images_to_fit = false; | 50   web_prefs->shrinks_standalone_images_to_fit = false; | 
| 51   web_prefs->should_clear_document_background = false; | 51   web_prefs->should_clear_document_background = false; | 
|  | 52   web_prefs->viewport_meta_enabled = true; | 
| 52 } | 53 } | 
| 53 | 54 | 
| 54 const void* const kAwSettingsUserDataKey = &kAwSettingsUserDataKey; | 55 const void* const kAwSettingsUserDataKey = &kAwSettingsUserDataKey; | 
| 55 | 56 | 
| 56 };  // namespace | 57 };  // namespace | 
| 57 | 58 | 
| 58 class AwSettingsUserData : public base::SupportsUserData::Data { | 59 class AwSettingsUserData : public base::SupportsUserData::Data { | 
| 59  public: | 60  public: | 
| 60   explicit AwSettingsUserData(AwSettings* ptr) : settings_(ptr) {} | 61   explicit AwSettingsUserData(AwSettings* ptr) : settings_(ptr) {} | 
| 61 | 62 | 
| (...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 452     JNIEnv* env, | 453     JNIEnv* env, | 
| 453     const JavaParamRef<jclass>& clazz) { | 454     const JavaParamRef<jclass>& clazz) { | 
| 454   return base::android::ConvertUTF8ToJavaString(env, GetUserAgent()); | 455   return base::android::ConvertUTF8ToJavaString(env, GetUserAgent()); | 
| 455 } | 456 } | 
| 456 | 457 | 
| 457 bool RegisterAwSettings(JNIEnv* env) { | 458 bool RegisterAwSettings(JNIEnv* env) { | 
| 458   return RegisterNativesImpl(env); | 459   return RegisterNativesImpl(env); | 
| 459 } | 460 } | 
| 460 | 461 | 
| 461 }  // namespace android_webview | 462 }  // namespace android_webview | 
| OLD | NEW | 
|---|