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 ebdadbf503f2e5d654450c444144406e93a385fd..b6bc008432d16b09c37cb4680a68dfbdcf4d6a90 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 |
@@ -245,7 +245,7 @@ public class ContentViewCore implements MotionEventDelegate { |
mAccessibilityInjector = AccessibilityInjector.newInstance(this); |
mAccessibilityInjector.addOrRemoveAccessibilityApisIfNecessary(); |
- initialize(context, nativeWebContents, personality); |
+ initialize(context, nativeWebContents, personality, false); |
} |
/** |
@@ -263,12 +263,14 @@ public class ContentViewCore implements MotionEventDelegate { |
} |
// TODO(jrg): incomplete; upstream the rest of this method. |
- private void initialize(Context context, int nativeWebContents, int personality) { |
+ private void initialize(Context context, int nativeWebContents, int personality, |
+ boolean isAccessFromFileURLsGrantedByDefault) { |
mNativeContentViewCore = nativeInit(nativeWebContents); |
mCleanupReference = new CleanupReference(this, new DestroyRunnable(mNativeContentViewCore)); |
mPersonality = personality; |
- mContentSettings = new ContentSettings(this, mNativeContentViewCore); |
+ mContentSettings = new ContentSettings( |
+ this, mNativeContentViewCore, isAccessFromFileURLsGrantedByDefault); |
mContainerView.setFocusable(true); |
mContainerView.setFocusableInTouchMode(true); |
if (mContainerView.getScrollBarStyle() == View.SCROLLBARS_INSIDE_OVERLAY) { |