[Android WebView] Move the most of WebSettings into AwSettings

content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

Index: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
index fc76afa7c0da93b0e80acfdf25642da699559c75..94190beda3910d4d9e1dc14ce94526364789337a 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
@@ -519,7 +519,6 @@ public class ContentViewCore implements MotionEventDelegate, NavigationClient {
      *                           containerView.
      * @param nativeWebContents A pointer to the native web contents.
      * @param windowAndroid An instance of the WindowAndroid.
-     * @param isAccessFromFileURLsGrantedByDefault Default WebSettings configuration.
      */
     // Perform important post-construction set up of the ContentViewCore.
     // We do not require the containing view in the constructor to allow embedders to create a
@@ -531,8 +530,7 @@ public class ContentViewCore implements MotionEventDelegate, NavigationClient {
     // Note that the caller remains the owner of the nativeWebContents and is responsible for
     // deleting it after destroying the ContentViewCore.
     public void initialize(ViewGroup containerView, InternalAccessDelegate internalDispatcher,
-            int nativeWebContents, WindowAndroid windowAndroid,
-            boolean isAccessFromFileURLsGrantedByDefault) {
+            int nativeWebContents, WindowAndroid windowAndroid) {
         // Check whether to use hardware acceleration. This is a bit hacky, and
         // only works if the Context is actually an Activity (as it is in the
         // Chrome application).
@@ -560,12 +558,8 @@ public class ContentViewCore implements MotionEventDelegate, NavigationClient {
 
         mNativeContentViewCore = nativeInit(mHardwareAccelerated,
                 nativeWebContents, viewAndroidNativePointer, windowNativePointer);
-        mContentSettings = new ContentSettings(
-                this, mNativeContentViewCore, isAccessFromFileURLsGrantedByDefault);
+        mContentSettings = new ContentSettings(this, mNativeContentViewCore);
         initializeContainerView(internalDispatcher);
-        if (mPersonality == PERSONALITY_VIEW) {

[joth, 2013/04/24 17:07:44]

can we get rid of the PERSONALITY thing from content view altogether now?

[mnaganov (inactive), 2013/04/24 17:41:37]

I've found this fragment in initializeContainerView:

if (mPersonality == PERSONALITY_CHROME) {
            // Doing this in PERSONALITY_VIEW mode causes rendering problems in
our
            // current WebView test case (the HTMLViewer application).
            // TODO(benm): Figure out why this is the case.
            if (mContainerView.getScrollBarStyle() ==
View.SCROLLBARS_INSIDE_OVERLAY) {
                mContainerView.setHorizontalScrollBarEnabled(false);
                mContainerView.setVerticalScrollBarEnabled(false);
            }
        }

I guess, this is the only obstacle to getting rid of it.

[benm (inactive), 2013/04/24 18:02:15]

Ah, I remember that one, never did get to the bottom of that weirdness. It was a
very long time ago though so would be worth just removing and seeing what
happens.

-            setAllUserAgentOverridesInHistory();
-        }
 
         mAccessibilityInjector = AccessibilityInjector.newInstance(this);
         mAccessibilityInjector.addOrRemoveAccessibilityApisIfNecessary();
@@ -812,11 +806,6 @@ public class ContentViewCore implements MotionEventDelegate, NavigationClient {
                 params.mCanLoadLocalResources);
     }
 
-    void setAllUserAgentOverridesInHistory() {
-        nativeSetAllUserAgentOverridesInHistory(mNativeContentViewCore,
-                mContentSettings.getUserAgentString());
-    }
-
     /**
      * Stops loading the current web contents.
      */
@@ -2756,9 +2745,6 @@ public class ContentViewCore implements MotionEventDelegate, NavigationClient {
             String virtualUrlForDataUrl,
             boolean canLoadLocalResources);
 
-    private native void nativeSetAllUserAgentOverridesInHistory(int nativeContentViewCoreImpl,
-            String userAgentOverride);
-
     private native String nativeGetURL(int nativeContentViewCoreImpl);
 
     private native String nativeGetTitle(int nativeContentViewCoreImpl);