| 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 27ef67dd4b77b4439d86380598a66a579e004dd3..6e25d828591c68544bdaa053719c32a6f877be9a 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
|
| @@ -6,7 +6,6 @@
|
|
|
| import android.annotation.SuppressLint;
|
| import android.app.Fragment;
|
| -import android.app.Notification;
|
| import android.content.Intent;
|
| import android.content.pm.ActivityInfo;
|
| import android.content.pm.PackageManager.NameNotFoundException;
|
| @@ -28,8 +27,6 @@
|
| import org.chromium.base.annotations.SuppressFBWarnings;
|
| import org.chromium.base.library_loader.ProcessInitException;
|
| import org.chromium.chrome.R;
|
| -import org.chromium.chrome.browser.preferences.website.WebsitePreferences;
|
| -import org.chromium.chrome.browser.preferences.website.WebsiteSettingsCategoryFilter;
|
|
|
| /**
|
| * The Chrome settings activity.
|
| @@ -139,23 +136,6 @@ protected void onCreate(Bundle savedInstanceState) {
|
| Bundle initialArguments = getIntent().getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS);
|
| boolean displayHomeAsUp = getIntent().getBooleanExtra(EXTRA_DISPLAY_HOME_AS_UP, true);
|
|
|
| - // The notification settings cog on the flipped side of Notifications and in the Android
|
| - // Settings "App Notifications" view will open us with a specific category rather than
|
| - // the default intent extras which are commonly used to open specific views.
|
| - if (getIntent().hasCategory(Notification.INTENT_CATEGORY_NOTIFICATION_PREFERENCES)) {
|
| - Bundle arguments = new Bundle();
|
| - arguments.putString(WebsitePreferences.EXTRA_CATEGORY,
|
| - WebsiteSettingsCategoryFilter.FILTER_PUSH_NOTIFICATIONS);
|
| - arguments.putString(WebsitePreferences.EXTRA_TITLE,
|
| - getResources().getString(R.string.push_notifications_permission_title));
|
| -
|
| - // TODO(peter): Open the appropriate page for the origin in the Website Settings.
|
| -
|
| - initialFragment = WebsitePreferences.class.getName();
|
| - initialArguments = arguments;
|
| - displayHomeAsUp = false;
|
| - }
|
| -
|
| if (displayHomeAsUp) getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
|
|
| // This must be called before the fragment transaction below.
|
|
|