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

Side by Side Diff: chrome/browser/android/chromium_application.cc

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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/android/chromium_application.h" 5 #include "chrome/browser/android/chromium_application.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "chrome/browser/android/tab_android.h" 10 #include "chrome/browser/android/tab_android.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 } 103 }
104 104
105 namespace chrome { 105 namespace chrome {
106 namespace android { 106 namespace android {
107 107
108 // static 108 // static
109 bool ChromiumApplication::RegisterBindings(JNIEnv* env) { 109 bool ChromiumApplication::RegisterBindings(JNIEnv* env) {
110 return RegisterNativesImpl(env); 110 return RegisterNativesImpl(env);
111 } 111 }
112 112
113 void ChromiumApplication::OpenProtectedContentSettings() {
114 Java_ChromiumApplication_openProtectedContentSettings(
115 base::android::AttachCurrentThread(),
116 base::android::GetApplicationContext());
117 }
118
119 void ChromiumApplication::ShowAutofillSettings() { 113 void ChromiumApplication::ShowAutofillSettings() {
120 Java_ChromiumApplication_showAutofillSettings( 114 Java_ChromiumApplication_showAutofillSettings(
121 base::android::AttachCurrentThread(), 115 base::android::AttachCurrentThread(),
122 base::android::GetApplicationContext()); 116 base::android::GetApplicationContext());
123 } 117 }
124 118
125 void ChromiumApplication::ShowPasswordSettings() { 119 void ChromiumApplication::ShowPasswordSettings() {
126 Java_ChromiumApplication_showPasswordSettings( 120 Java_ChromiumApplication_showPasswordSettings(
127 base::android::AttachCurrentThread(), 121 base::android::AttachCurrentThread(),
128 base::android::GetApplicationContext()); 122 base::android::GetApplicationContext());
(...skipping 10 matching lines...) Expand all
139 } 133 }
140 134
141 bool ChromiumApplication::AreParentalControlsEnabled() { 135 bool ChromiumApplication::AreParentalControlsEnabled() {
142 return Java_ChromiumApplication_areParentalControlsEnabled( 136 return Java_ChromiumApplication_areParentalControlsEnabled(
143 base::android::AttachCurrentThread(), 137 base::android::AttachCurrentThread(),
144 base::android::GetApplicationContext()); 138 base::android::GetApplicationContext());
145 } 139 }
146 140
147 } // namespace android 141 } // namespace android
148 } // namespace chrome 142 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698