diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-01-11 02:29:00 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-11 02:29:00 -0800 |
| commit | 21c0d442b453677e9e77abea31be17fd4032b1a6 (patch) | |
| tree | 1ebbcd6acf648a4d54685c6f365e3ebec039f885 | |
| parent | 816cdd39a218e76198fe552617fe101277f11184 (diff) | |
| parent | a71f9a9fbe6352a660bc2d18d8ad4fac7fa982b8 (diff) | |
| download | external_webkit-21c0d442b453677e9e77abea31be17fd4032b1a6.zip external_webkit-21c0d442b453677e9e77abea31be17fd4032b1a6.tar.gz external_webkit-21c0d442b453677e9e77abea31be17fd4032b1a6.tar.bz2 | |
Merge "Fix a warning" into honeycomb
| -rw-r--r-- | WebCore/page/Settings.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/page/Settings.h b/WebCore/page/Settings.h index 5b42e89..e4cccb1 100644 --- a/WebCore/page/Settings.h +++ b/WebCore/page/Settings.h @@ -555,12 +555,12 @@ namespace WebCore { bool m_hyperlinkAuditingEnabled : 1; bool m_crossOriginCheckInGetMatchedCSSRulesDisabled : 1; -#ifdef ANDROID_PLUGINS - bool m_pluginsOnDemand : 1; -#endif #if ENABLE(WEB_AUTOFILL) bool m_autoFillEnabled: 1; #endif +#ifdef ANDROID_PLUGINS + bool m_pluginsOnDemand : 1; +#endif #if USE(SAFARI_THEME) static bool gShouldPaintNativeControls; |