Use contents size for android_webview layout.

android_webview/native/aw_settings.cc

Index: android_webview/native/aw_settings.cc
diff --git a/android_webview/native/aw_settings.cc b/android_webview/native/aw_settings.cc
index 46651f370e7ef8ee4385ab95c9da80554c86fa18..9db12aecc5e1743944f47a79bad4c8acebf09a6b 100644
--- a/android_webview/native/aw_settings.cc
+++ b/android_webview/native/aw_settings.cc
@@ -72,8 +72,8 @@ void AwSettings::UpdateEverythingLocked(JNIEnv* env, jobject obj) {
   UpdateWebkitPreferencesLocked(env, obj);
   UpdateUserAgentLocked(env, obj);
   ResetScrollAndScaleState(env, obj);
-  UpdatePreferredSizeMode();
   UpdateFormDataPreferencesLocked(env, obj);
+  UpdateContentSizeNotificationMode(env, obj);
 }
 
 void AwSettings::UpdateUserAgentLocked(JNIEnv* env, jobject obj) {
@@ -230,8 +230,12 @@ void AwSettings::UpdateInitialPageScaleLocked(JNIEnv* env, jobject obj) {
   }
 }
 
-void AwSettings::UpdatePreferredSizeMode() {
-  if (web_contents()->GetRenderViewHost()) {
+void AwSettings::UpdateContentSizeNotificationMode(JNIEnv* env, jobject obj) {
+  bool support_quirks = Java_AwSettings_getSupportLegacyQuirksLocked(env, obj);
+  if (support_quirks) {
+    GetAwRenderViewHostExt()->EnableContentsSizeNotifications();
+  }
+  if (!support_quirks && web_contents()->GetRenderViewHost()) {

[benm (inactive), 2013/09/06 19:27:53]

cache wc->GRVH?

[mnaganov (inactive), 2013/09/06 21:07:04]

nit: perhaps write as:

if (support_quirks) { ... } else if (web_contents()->GetRenderViewHost()) { ...
}

[mkosiba (inactive), 2013/09/09 13:46:21]

Done.

[mkosiba (inactive), 2013/09/09 13:46:21]

Done.

     web_contents()->GetRenderViewHost()->EnablePreferredSizeMode();
   }
 }