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

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

Issue 2230203002: chrome: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed accidental components/ change Created 4 years, 4 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 "base/stl_util.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
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); 109 permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_KEYGEN);
110 110
111 std::map<ContentSettingsType, ContentSetting> 111 std::map<ContentSettingsType, ContentSetting>
112 user_specified_settings_to_display; 112 user_specified_settings_to_display;
113 113
114 for (const auto& permission : permission_info_list) { 114 for (const auto& permission : permission_info_list) {
115 if (ContainsValue(permissions_to_display, permission.type) && 115 if (base::ContainsValue(permissions_to_display, permission.type) &&
116 permission.setting != CONTENT_SETTING_DEFAULT) { 116 permission.setting != CONTENT_SETTING_DEFAULT) {
117 user_specified_settings_to_display[permission.type] = permission.setting; 117 user_specified_settings_to_display[permission.type] = permission.setting;
118 } 118 }
119 } 119 }
120 120
121 for (const auto& permission : permissions_to_display) { 121 for (const auto& permission : permissions_to_display) {
122 if (ContainsKey(user_specified_settings_to_display, permission)) { 122 if (base::ContainsKey(user_specified_settings_to_display, permission)) {
123 base::string16 setting_title = 123 base::string16 setting_title =
124 WebsiteSettingsUI::PermissionTypeToUIString(permission); 124 WebsiteSettingsUI::PermissionTypeToUIString(permission);
125 125
126 Java_WebsiteSettingsPopup_addPermissionSection( 126 Java_WebsiteSettingsPopup_addPermissionSection(
127 env, 127 env,
128 popup_jobject_.obj(), 128 popup_jobject_.obj(),
129 ConvertUTF16ToJavaString(env, setting_title).obj(), 129 ConvertUTF16ToJavaString(env, setting_title).obj(),
130 static_cast<jint>(permission), 130 static_cast<jint>(permission),
131 static_cast<jint>(user_specified_settings_to_display[permission])); 131 static_cast<jint>(user_specified_settings_to_display[permission]));
132 } 132 }
(...skipping 18 matching lines...) Expand all
151 WebsiteSettingsUI::TabId tab_id) { 151 WebsiteSettingsUI::TabId tab_id) {
152 // There's no tab UI on Android - only connection info is shown. 152 // There's no tab UI on Android - only connection info is shown.
153 NOTIMPLEMENTED(); 153 NOTIMPLEMENTED();
154 } 154 }
155 155
156 // static 156 // static
157 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid( 157 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid(
158 JNIEnv* env) { 158 JNIEnv* env) {
159 return RegisterNativesImpl(env); 159 return RegisterNativesImpl(env);
160 } 160 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/android/connection_info_popup_android.cc ('k') | chrome/browser/ui/app_list/app_list_syncable_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698