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

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

Issue 1715683002: chrome: Use base's ContainsValue helper function instead of std::find (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated as per latest code Created 4 years, 10 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/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 "base/stl_util.h"
10 #include "chrome/browser/infobars/infobar_service.h" 11 #include "chrome/browser/infobars/infobar_service.h"
11 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/ssl/chrome_security_state_model_client.h" 13 #include "chrome/browser/ssl/chrome_security_state_model_client.h"
13 #include "chrome/browser/ui/website_settings/website_settings.h" 14 #include "chrome/browser/ui/website_settings/website_settings.h"
14 #include "chrome/browser/ui/website_settings/website_settings_ui.h" 15 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
15 #include "components/content_settings/core/common/content_settings.h" 16 #include "components/content_settings/core/common/content_settings.h"
16 #include "components/content_settings/core/common/content_settings_types.h" 17 #include "components/content_settings/core/common/content_settings_types.h"
17 #include "content/public/browser/browser_context.h" 18 #include "content/public/browser/browser_context.h"
18 #include "content/public/browser/cert_store.h" 19 #include "content/public/browser/cert_store.h"
19 #include "content/public/browser/navigation_controller.h" 20 #include "content/public/browser/navigation_controller.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_NOTIFICATIONS); 98 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
98 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_IMAGES); 99 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_IMAGES);
99 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_JAVASCRIPT); 100 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_JAVASCRIPT);
100 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_POPUPS); 101 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_POPUPS);
101 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_KEYGEN); 102 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_KEYGEN);
102 103
103 std::map<ContentSettingsType, ContentSetting> 104 std::map<ContentSettingsType, ContentSetting>
104 user_specified_settings_to_display; 105 user_specified_settings_to_display;
105 106
106 for (const auto& permission : permission_info_list) { 107 for (const auto& permission : permission_info_list) {
107 if (std::find(permissions_to_display.begin(), 108 if (ContainsValue(permissions_to_display, permission.type) &&
108 permissions_to_display.end(),
109 permission.type) != permissions_to_display.end() &&
110 permission.setting != CONTENT_SETTING_DEFAULT) { 109 permission.setting != CONTENT_SETTING_DEFAULT) {
111 user_specified_settings_to_display[permission.type] = permission.setting; 110 user_specified_settings_to_display[permission.type] = permission.setting;
112 } 111 }
113 } 112 }
114 113
115 for (const auto& permission : permissions_to_display) { 114 for (const auto& permission : permissions_to_display) {
116 if (ContainsKey(user_specified_settings_to_display, permission)) { 115 if (ContainsKey(user_specified_settings_to_display, permission)) {
117 base::string16 setting_title = 116 base::string16 setting_title =
118 WebsiteSettingsUI::PermissionTypeToUIString(permission); 117 WebsiteSettingsUI::PermissionTypeToUIString(permission);
119 118
(...skipping 13 matching lines...) Expand all
133 WebsiteSettingsUI::TabId tab_id) { 132 WebsiteSettingsUI::TabId tab_id) {
134 // There's no tab UI on Android - only connection info is shown. 133 // There's no tab UI on Android - only connection info is shown.
135 NOTIMPLEMENTED(); 134 NOTIMPLEMENTED();
136 } 135 }
137 136
138 // static 137 // static
139 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid( 138 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid(
140 JNIEnv* env) { 139 JNIEnv* env) {
141 return RegisterNativesImpl(env); 140 return RegisterNativesImpl(env);
142 } 141 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698