Revert of Fix TODOs related to SDK 24

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

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.android_webview;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Handler;
@@ skipping 16 matching lines @@
  * Stores Android WebView specific settings that does not need to be synced to WebKit.
  *
  * Methods in this class can be called from any thread, including threads created by
  * the client of WebView.
  */
 @JNINamespace("android_webview")
 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
     // used from any thread. Internally, the class uses a message queue
     // to call native code on the UI thread only.
 
     // Values passed in on construction.
     private final boolean mHasInternetPermission;
 
     private ZoomSupportChangeListener mZoomChangeListener;
@@ skipping 32 matching lines @@
     private boolean mForceZeroLayoutHeight;
     private boolean mLoadWithOverviewMode;
     private boolean mMediaPlaybackRequiresUserGesture = true;
     private String mDefaultVideoPosterURL;
     private float mInitialPageScalePercent;
     private boolean mSpatialNavigationEnabled;  // Default depends on device features.
     private boolean mEnableSupportedHardwareAcceleratedFeatures;
     private int mMixedContentMode = WebSettings.MIXED_CONTENT_NEVER_ALLOW;
 
     private boolean mOffscreenPreRaster;
-    private int mDisabledMenuItems = WebSettings.MENU_ITEM_NONE;
+    private int mDisabledMenuItems = MENU_ITEM_NONE;
 
     // Although this bit is stored on AwSettings it is actually controlled via the CookieManager.
     private boolean mAcceptThirdPartyCookies;
 
     private final boolean mSupportLegacyQuirks;
     private final boolean mAllowEmptyDocumentPersistence;
     private final boolean mAllowGeolocationOnInsecureOrigins;
 
     private final boolean mPasswordEchoEnabled;
 
@@ skipping 1683 matching lines @@
     private native void nativeUpdateWebkitPreferencesLocked(long nativeAwSettings);
 
     private static native String nativeGetDefaultUserAgent();
 
     private native void nativeUpdateFormDataPreferencesLocked(long nativeAwSettings);
 
     private native void nativeUpdateRendererPreferencesLocked(long nativeAwSettings);
 
     private native void nativeUpdateOffscreenPreRasterLocked(long nativeAwSettings);
 }