Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1163)

Unified Diff: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

Issue 10827274: [Android] Implement WebSettings APIs for FileURL resource access conrol (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/android/java/src/org/chromium/content/browser/ContentSettings.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) {
« no previous file with comments | « content/public/android/java/src/org/chromium/content/browser/ContentSettings.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698