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

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

Issue 1432573002: Adding <keygen> Content Setting (Android UI) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@keygen_ui
Patch Set: Trying tested code. Created 4 years, 11 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
« no previous file with comments | « chrome/browser/android/preferences/website_preference_bridge.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/website_settings_popup_android.h" 5 #include "chrome/browser/ui/android/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 "chrome/browser/infobars/infobar_service.h" 10 #include "chrome/browser/infobars/infobar_service.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 // On Android, we only want to display a subset of the available options in a 102 // On Android, we only want to display a subset of the available options in a
103 // particular order, but only if their value is different from the default. 103 // particular order, but only if their value is different from the default.
104 std::vector<ContentSettingsType> permissions_to_display; 104 std::vector<ContentSettingsType> permissions_to_display;
105 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_GEOLOCATION); 105 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_GEOLOCATION);
106 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA); 106 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
107 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC); 107 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
108 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_NOTIFICATIONS); 108 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
109 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_IMAGES); 109 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_IMAGES);
110 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_JAVASCRIPT); 110 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_JAVASCRIPT);
111 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_POPUPS); 111 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_POPUPS);
112 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_KEYGEN);
112 113
113 std::map<ContentSettingsType, ContentSetting> 114 std::map<ContentSettingsType, ContentSetting>
114 user_specified_settings_to_display; 115 user_specified_settings_to_display;
115 116
116 for (const auto& permission : permission_info_list) { 117 for (const auto& permission : permission_info_list) {
117 if (std::find(permissions_to_display.begin(), 118 if (std::find(permissions_to_display.begin(),
118 permissions_to_display.end(), 119 permissions_to_display.end(),
119 permission.type) != permissions_to_display.end() && 120 permission.type) != permissions_to_display.end() &&
120 permission.setting != CONTENT_SETTING_DEFAULT) { 121 permission.setting != CONTENT_SETTING_DEFAULT) {
121 user_specified_settings_to_display[permission.type] = permission.setting; 122 user_specified_settings_to_display[permission.type] = permission.setting;
(...skipping 21 matching lines...) Expand all
143 WebsiteSettingsUI::TabId tab_id) { 144 WebsiteSettingsUI::TabId tab_id) {
144 // There's no tab UI on Android - only connection info is shown. 145 // There's no tab UI on Android - only connection info is shown.
145 NOTIMPLEMENTED(); 146 NOTIMPLEMENTED();
146 } 147 }
147 148
148 // static 149 // static
149 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid( 150 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid(
150 JNIEnv* env) { 151 JNIEnv* env) {
151 return RegisterNativesImpl(env); 152 return RegisterNativesImpl(env);
152 } 153 }
OLDNEW
« no previous file with comments | « chrome/browser/android/preferences/website_preference_bridge.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698