diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 17:16:02 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 17:16:02 +0000 |
| commit | 5c90d03daec06693271c4ec0066a452e7a7e7b8a (patch) | |
| tree | bd0ee5087c976526fc557eff46a71aff5874c195 /webkit/glue | |
| parent | d830c09a119ef8fdb996c54cf7dc27696a12c637 (diff) | |
| download | chromium_src-5c90d03daec06693271c4ec0066a452e7a7e7b8a.zip chromium_src-5c90d03daec06693271c4ec0066a452e7a7e7b8a.tar.gz chromium_src-5c90d03daec06693271c4ec0066a452e7a7e7b8a.tar.bz2 | |
[Android WebView] Implement WebSettings.{get|set}UseWideViewport
The setting is mapped directly onto WebKit's WebSettings.viewportEnabled
R=benm@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11759023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176103 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/webpreferences.cc | 3 | ||||
| -rw-r--r-- | webkit/glue/webpreferences.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc index 7c783fb..3c791e9 100644 --- a/webkit/glue/webpreferences.cc +++ b/webkit/glue/webpreferences.cc @@ -138,6 +138,7 @@ WebPreferences::WebPreferences() editing_behavior(EDITING_BEHAVIOR_MAC), #endif supports_multiple_windows(true), + viewport_enabled(false), cookie_enabled(true) #if defined(OS_ANDROID) , @@ -475,6 +476,8 @@ void WebPreferences::Apply(WebView* web_view) const { settings->setSupportsMultipleWindows(supports_multiple_windows); + settings->setViewportEnabled(viewport_enabled); + #if defined(OS_ANDROID) settings->setAllowCustomScrollbarInMainFrame(false); settings->setTextAutosizingEnabled(text_autosizing_enabled); diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h index d807b06..3630515 100644 --- a/webkit/glue/webpreferences.h +++ b/webkit/glue/webpreferences.h @@ -153,6 +153,7 @@ struct WEBKIT_GLUE_EXPORT WebPreferences { int number_of_cpu_cores; EditingBehavior editing_behavior; bool supports_multiple_windows; + bool viewport_enabled; // This flags corresponds to a Page's Settings' setCookieEnabled state. It // only controls whether or not the "document.cookie" field is properly |