chrome/android/java/src/org/chromium/chrome/browser/ChromiumApplication.java - Issue 1091253005: [Android] Update Protected Media Identifier Settings UI to reflect exceptions.

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

Issue 1091253005: [Android] Update Protected Media Identifier Settings UI to reflect exceptions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 8 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/res/xml/website_preferences.xml ('k') | chrome/android/java/src/org/chromium/chrome/browser/preferences/Preferences.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/preferences/Preferences.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 5c85ef33be87c7386e4a5dd396babd4a8f94f308..2dc3cce39ddd756051a5d65d2294b28feb8e18fc 100644

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

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

@@ -8,7 +8,6 @@ import android.app.Activity;

import android.content.Context;

import android.content.Intent;

import android.content.SharedPreferences;

-import android.os.Build;

import android.os.Bundle;

import android.os.SystemClock;

import android.preference.PreferenceManager;

@@ -31,7 +30,6 @@ import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomiza

import org.chromium.chrome.browser.preferences.LocationSettings;

import org.chromium.chrome.browser.preferences.Preferences;

import org.chromium.chrome.browser.preferences.PreferencesLauncher;

-import org.chromium.chrome.browser.preferences.ProtectedContentPreferences;

import org.chromium.chrome.browser.preferences.autofill.AutofillPreferences;

import org.chromium.chrome.browser.preferences.password.ManageSavedPasswordsPreferences;

import org.chromium.chrome.browser.preferences.privacy.PrivacyPreferences;

@@ -91,12 +89,6 @@ public abstract class ChromiumApplication extends ContentApplication {

/**

* Opens a protected content settings page, if available.

newt (away) 2015/04/30 00:31:59 delete orphaned comment

knn 2015/04/30 16:00:36 Sorry about this. Done.

- @CalledByNative

- protected void openProtectedContentSettings() {

- assert Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;

- PreferencesLauncher.launchSettingsPage(this,

- ProtectedContentPreferences.class.getName());

- }

@CalledByNative

protected void showAutofillSettings() {