| OLD | NEW |
| 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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 | 95 |
| 96 // On Android, we only want to display a subset of the available options in a | 96 // On Android, we only want to display a subset of the available options in a |
| 97 // particular order, but only if their value is different from the default. | 97 // particular order, but only if their value is different from the default. |
| 98 std::vector<ContentSettingsType> permissions_to_display; | 98 std::vector<ContentSettingsType> permissions_to_display; |
| 99 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_GEOLOCATION); | 99 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_GEOLOCATION); |
| 100 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA); | 100 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA); |
| 101 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC); | 101 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC); |
| 102 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_NOTIFICATIONS); | 102 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_NOTIFICATIONS); |
| 103 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_IMAGES); | 103 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_IMAGES); |
| 104 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_JAVASCRIPT); | 104 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_JAVASCRIPT); |
| 105 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_KEYGEN); |
| 105 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_POPUPS); | 106 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_POPUPS); |
| 106 | 107 |
| 107 std::map<ContentSettingsType, ContentSetting> | 108 std::map<ContentSettingsType, ContentSetting> |
| 108 user_specified_settings_to_display; | 109 user_specified_settings_to_display; |
| 109 | 110 |
| 110 for (const auto& permission : permission_info_list) { | 111 for (const auto& permission : permission_info_list) { |
| 111 if (std::find(permissions_to_display.begin(), | 112 if (std::find(permissions_to_display.begin(), |
| 112 permissions_to_display.end(), | 113 permissions_to_display.end(), |
| 113 permission.type) != permissions_to_display.end() && | 114 permission.type) != permissions_to_display.end() && |
| 114 permission.setting != CONTENT_SETTING_DEFAULT) { | 115 permission.setting != CONTENT_SETTING_DEFAULT) { |
| (...skipping 22 matching lines...) Expand all Loading... |
| 137 WebsiteSettingsUI::TabId tab_id) { | 138 WebsiteSettingsUI::TabId tab_id) { |
| 138 // There's no tab UI on Android - only connection info is shown. | 139 // There's no tab UI on Android - only connection info is shown. |
| 139 NOTIMPLEMENTED(); | 140 NOTIMPLEMENTED(); |
| 140 } | 141 } |
| 141 | 142 |
| 142 // static | 143 // static |
| 143 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid( | 144 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid( |
| 144 JNIEnv* env) { | 145 JNIEnv* env) { |
| 145 return RegisterNativesImpl(env); | 146 return RegisterNativesImpl(env); |
| 146 } | 147 } |
| OLD | NEW |