android_webview/java/src/org/chromium/android_webview/AwSettings.java - Issue 2738663003: Fix TODOs related to SDK 24

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/AwSettings.java

Issue 2738663003: Fix TODOs related to SDK 24 (Closed)

Patch Set: Re-revert fix TODOs related to SDK 24 Created 3 years, 9 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/AwContents.java ('k') | content/public/android/java/src/org/chromium/content/browser/ContentViewCore.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/AwSettings.java

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

index 231091e21b03ac280b218961d6ff61ceb17b57b7..a49d01c85f44154ef9fd0c4559bd6c7e8b56a5f5 100644

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

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

@@ -34,9 +34,6 @@ public class AwSettings {

private static final String LOGTAG = AwSettings.class.getSimpleName();

private static final boolean TRACE = false;

- // TODO(hush): Use android.webkit.WebSettings.MENU_ITEM_*. crbug.com/546762.

- private static final int MENU_ITEM_NONE = 0;

private static final String TAG = "AwSettings";

// This class must be created on the UI thread. Afterwards, it can be

@@ -89,7 +86,7 @@ public class AwSettings {

private int mMixedContentMode = WebSettings.MIXED_CONTENT_NEVER_ALLOW;

private boolean mOffscreenPreRaster;

- private int mDisabledMenuItems = MENU_ITEM_NONE;

+ private int mDisabledMenuItems = WebSettings.MENU_ITEM_NONE;

// Although this bit is stored on AwSettings it is actually controlled via the CookieManager.

private boolean mAcceptThirdPartyCookies;