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

Side by Side Diff: chrome/browser/ui/android/page_info/website_settings_popup_android.cc

Issue 2536993002: Remove support for the keygen tag (Closed)
Patch Set: Rebased Created 3 years, 12 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/ui/android/page_info/website_settings_popup_android.h" 5 #include "chrome/browser/ui/android/page_info/website_settings_popup_android.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_array.h" 8 #include "base/android/jni_array.h"
9 #include "base/android/jni_string.h" 9 #include "base/android/jni_string.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 // On Android, we only want to display a subset of the available options in a 104 // On Android, we only want to display a subset of the available options in a
105 // particular order, but only if their value is different from the default. 105 // particular order, but only if their value is different from the default.
106 std::vector<ContentSettingsType> permissions_to_display; 106 std::vector<ContentSettingsType> permissions_to_display;
107 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_GEOLOCATION); 107 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_GEOLOCATION);
108 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA); 108 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
109 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC); 109 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
110 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_NOTIFICATIONS); 110 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
111 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_IMAGES); 111 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_IMAGES);
112 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_JAVASCRIPT); 112 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_JAVASCRIPT);
113 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_POPUPS); 113 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_POPUPS);
114 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_KEYGEN);
115 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_AUTOPLAY); 114 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_AUTOPLAY);
116 115
117 std::map<ContentSettingsType, ContentSetting> 116 std::map<ContentSettingsType, ContentSetting>
118 user_specified_settings_to_display; 117 user_specified_settings_to_display;
119 118
120 for (const auto& permission : permission_info_list) { 119 for (const auto& permission : permission_info_list) {
121 if (base::ContainsValue(permissions_to_display, permission.type) && 120 if (base::ContainsValue(permissions_to_display, permission.type) &&
122 permission.setting != CONTENT_SETTING_DEFAULT) { 121 permission.setting != CONTENT_SETTING_DEFAULT) {
123 user_specified_settings_to_display[permission.type] = permission.setting; 122 user_specified_settings_to_display[permission.type] = permission.setting;
124 } 123 }
(...skipping 28 matching lines...) Expand all
153 WebsiteSettingsUI::TabId tab_id) { 152 WebsiteSettingsUI::TabId tab_id) {
154 // There's no tab UI on Android - only connection info is shown. 153 // There's no tab UI on Android - only connection info is shown.
155 NOTIMPLEMENTED(); 154 NOTIMPLEMENTED();
156 } 155 }
157 156
158 // static 157 // static
159 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid( 158 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid(
160 JNIEnv* env) { 159 JNIEnv* env) {
161 return RegisterNativesImpl(env); 160 return RegisterNativesImpl(env);
162 } 161 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698