Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/ProtectedContentPreferences.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
Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/ProtectedContentPreferences.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/ProtectedContentPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/ProtectedContentPreferences.java
deleted file mode 100644
index a73c273775c61166a0608e00ab291d00006ac943..0000000000000000000000000000000000000000
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/ProtectedContentPreferences.java
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2014 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.chrome.browser.preferences;
-
-import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.Preference.OnPreferenceClickListener;
-import android.preference.PreferenceFragment;
-import android.widget.Toast;
-
-import org.chromium.chrome.R;
-import org.chromium.content.browser.MediaDrmCredentialManager;
-import org.chromium.content.browser.MediaDrmCredentialManager.MediaDrmCredentialManagerCallback;
-
-/**
- * Fragment to keep track of the protected content preferences.
- */
-public class ProtectedContentPreferences extends PreferenceFragment implements
- ProtectedContentResetCredentialConfirmDialogFragment.Listener {
-
- private static final String PREF_RESET_DEVICE_CREDENTIALS_BUTTON =
- "reset_device_credentials_button";
- private static final String PREF_PROTECTED_CONTENT_SWITCH = "protected_content_switch";
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- addPreferencesFromResource(R.xml.protected_content_preferences);
- getActivity().setTitle(R.string.protected_content);
-
- ChromeSwitchPreference protectedContentSwitch =
- (ChromeSwitchPreference) findPreference(PREF_PROTECTED_CONTENT_SWITCH);
-
- boolean isProtectedContentEnabled =
- PrefServiceBridge.getInstance().isProtectedMediaIdentifierEnabled();
- protectedContentSwitch.setChecked(isProtectedContentEnabled);
-
- protectedContentSwitch.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
- @Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- PrefServiceBridge.getInstance().setProtectedMediaIdentifierEnabled(
- (boolean) newValue);
- return true;
- }
- });
-
-
- ButtonPreference resetDeviceCredentialsButton = (ButtonPreference)
- findPreference(PREF_RESET_DEVICE_CREDENTIALS_BUTTON);
-
- resetDeviceCredentialsButton.setOnPreferenceClickListener(new OnPreferenceClickListener(){
- @Override
- public boolean onPreferenceClick(Preference preference) {
- new ProtectedContentResetCredentialConfirmDialogFragment(
- ProtectedContentPreferences.this).show(getFragmentManager(), null);
- return true;
- }
- });
- }
-
- @Override
- public void resetDeviceCredential() {
- MediaDrmCredentialManager.resetCredentials(new MediaDrmCredentialManagerCallback() {
- @Override
- public void onCredentialResetFinished(boolean succeeded) {
- if (!succeeded) {
- String message = getString(
- R.string.protected_content_reset_failed);
- Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show();
- }
- }
- });
- }
-}

Powered by Google App Engine
This is Rietveld 408576698