| Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/Preferences.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Preferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/Preferences.java
|
| index 677f5fa12082509067ab016083b14ccf36828a2b..27ef67dd4b77b4439d86380598a66a579e004dd3 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Preferences.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/Preferences.java
|
| @@ -70,6 +70,8 @@ public abstract class Preferences extends ActionBarActivity implements
|
| * Opens a URL in a new activity.
|
| * @param titleResId The resource ID of the title to show above the web page.
|
| * @param urlResId The resource ID of the URL to load.
|
| + *
|
| + * TODO(newt): remove this method when EmbedContentViewActivity is upstreamed.
|
| */
|
| public abstract void showUrl(int titleResId, int urlResId);
|
|
|
| @@ -78,6 +80,35 @@ public abstract class Preferences extends ActionBarActivity implements
|
| */
|
| public void showGoogleTranslateHelp() {}
|
|
|
| + /**
|
| + * Launches the help page for privacy settings.
|
| + */
|
| + public void showPrivacyPreferencesHelp() {}
|
| +
|
| + /**
|
| + * Called when user changes the contextual search preference.
|
| + * @param newValue Whether contextual search is now enabled.
|
| + *
|
| + * TODO(newt): remove this method when contextual search is upstreamed.
|
| + */
|
| + public void logContextualSearchToggled(boolean newValue) {}
|
| +
|
| + /**
|
| + * Returns whether contextual search is enabled.
|
| + *
|
| + * TODO(newt): remove this method when contextual search is upstreamed.
|
| + */
|
| + public boolean isContextualSearchEnabled() {
|
| + return false;
|
| + }
|
| +
|
| + /**
|
| + * Notifies the precache launcher that the user has changed the network prediction preference.
|
| + *
|
| + * TODO(newt): remove this method when precache logic is upstreamed.
|
| + */
|
| + public void updatePrecachingEnabled() {}
|
| +
|
| @SuppressFBWarnings("DM_EXIT")
|
| @SuppressLint("InlinedApi")
|
| @Override
|
|
|