android_webview/java/src/org/chromium/android_webview/AwContents.java - Issue 920693003: Revert "Revert of [Android] Migrate javascript settings to a content setting from a pref. (patchset…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/java/src/org/chromium/android_webview/AwContents.java

Issue 920693003: Revert "Revert of [Android] Migrate javascript settings to a content setting from a pref. (patchset… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove jni registration Created 5 years, 10 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 | « android_webview/java/src/org/chromium/android_webview/AwContentViewClient.java ('k') | android_webview/java/src/org/chromium/android_webview/AwSettings.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/java/src/org/chromium/android_webview/AwContents.java

diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java

index e124eb5583574a04ce8d1f3712682f37aa00133a..2e57776ef0887506b2db3c2547880a1372c9c38f 100644

--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java

+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java

@@ -45,7 +45,6 @@ import org.chromium.base.TraceEvent;

import org.chromium.base.VisibleForTesting;

import org.chromium.components.navigation_interception.InterceptNavigationDelegate;

import org.chromium.components.navigation_interception.NavigationParams;

-import org.chromium.content.browser.ContentSettings;

import org.chromium.content.browser.ContentViewClient;

import org.chromium.content.browser.ContentViewCore;

import org.chromium.content.browser.ContentViewStatics;

@@ -1266,13 +1265,6 @@ public class AwContents implements SmartClipProvider {

}

/**

- * @see ContentViewCore#getContentSettings()

- */

- public ContentSettings getContentSettings() {

- return isDestroyed() ? null : mContentViewCore.getContentSettings();

- }

- /**

* @see View#setOverScrollMode(int)

public void setOverScrollMode(int mode) {