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

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: Fixing android typos. Created 5 years 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/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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 // On Android, we only want to display a subset of the available options in a 99 // On Android, we only want to display a subset of the available options in a
100 // particular order, but only if their value is different from the default. 100 // particular order, but only if their value is different from the default.
101 std::vector<ContentSettingsType> permissions_to_display; 101 std::vector<ContentSettingsType> permissions_to_display;
102 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_GEOLOCATION); 102 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_GEOLOCATION);
103 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA); 103 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
104 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC); 104 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
105 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_NOTIFICATIONS); 105 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
106 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_IMAGES); 106 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_IMAGES);
107 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_JAVASCRIPT); 107 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_JAVASCRIPT);
108 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_POPUPS); 108 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_POPUPS);
109 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_KEYGEN);
Finnur 2015/12/11 17:53:05 Don't you need code in the OIB bubble to show this
svaldez 2015/12/11 18:13:10 OIB bubble? This is just for displaying it in the
109 110
110 std::map<ContentSettingsType, ContentSetting> 111 std::map<ContentSettingsType, ContentSetting>
111 user_specified_settings_to_display; 112 user_specified_settings_to_display;
112 113
113 for (const auto& permission : permission_info_list) { 114 for (const auto& permission : permission_info_list) {
114 if (std::find(permissions_to_display.begin(), 115 if (std::find(permissions_to_display.begin(),
115 permissions_to_display.end(), 116 permissions_to_display.end(),
116 permission.type) != permissions_to_display.end() && 117 permission.type) != permissions_to_display.end() &&
117 permission.setting != CONTENT_SETTING_DEFAULT) { 118 permission.setting != CONTENT_SETTING_DEFAULT) {
118 user_specified_settings_to_display[permission.type] = permission.setting; 119 user_specified_settings_to_display[permission.type] = permission.setting;
(...skipping 21 matching lines...) Expand all
140 WebsiteSettingsUI::TabId tab_id) { 141 WebsiteSettingsUI::TabId tab_id) {
141 // There's no tab UI on Android - only connection info is shown. 142 // There's no tab UI on Android - only connection info is shown.
142 NOTIMPLEMENTED(); 143 NOTIMPLEMENTED();
143 } 144 }
144 145
145 // static 146 // static
146 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid( 147 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid(
147 JNIEnv* env) { 148 JNIEnv* env) {
148 return RegisterNativesImpl(env); 149 return RegisterNativesImpl(env);
149 } 150 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698