chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java - Issue 878413008: Remove WebsiteSettingsPopupLegacy.

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: chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java

Issue 878413008: Remove WebsiteSettingsPopupLegacy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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 | « chrome/android/java/src/org/chromium/chrome/browser/CertificateViewer.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopupLegacy.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java b/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java

index d3a6d5e66c1d5dc153abc679d171cb825b441c23..e25d15891b85c1ca384bbd96bf5b192af4457ae5 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java

@@ -32,8 +32,6 @@ import android.widget.Spinner;

import android.widget.TextView;

import org.chromium.base.CalledByNative;

-import org.chromium.base.CommandLine;

-import org.chromium.chrome.ChromeSwitches;

import org.chromium.chrome.R;

import org.chromium.chrome.browser.omnibox.OmniboxUrlEmphasizer;

import org.chromium.chrome.browser.profiles.Profile;

@@ -526,11 +524,7 @@ public class WebsiteSettingsPopup implements OnClickListener, OnItemSelectedList

@SuppressWarnings("unused")

public static void show(Context context, Profile profile, WebContents webContents) {

- if (!CommandLine.getInstance().hasSwitch(ChromeSwitches.DISABLE_NEW_WEBSITE_SETTINGS)) {

- new WebsiteSettingsPopup(context, profile, webContents);

- } else {

- WebsiteSettingsPopupLegacy.show(context, webContents);

- }

+ new WebsiteSettingsPopup(context, profile, webContents);

}

private static native long nativeInit(WebsiteSettingsPopup popup, WebContents webContents);