| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #import "ios/chrome/browser/ui/settings/block_popups_collection_view_controller.
h" | 5 #import "ios/chrome/browser/ui/settings/block_popups_collection_view_controller.
h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #import "base/mac/foundation_util.h" | 8 #import "base/mac/foundation_util.h" |
| 9 #include "base/strings/sys_string_conversions.h" | 9 #include "base/strings/sys_string_conversions.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| 11 #include "components/content_settings/core/browser/host_content_settings_map.h" | 11 #include "components/content_settings/core/browser/host_content_settings_map.h" |
| 12 #include "components/content_settings/core/common/content_settings.h" |
| 12 #include "components/content_settings/core/common/content_settings_pattern.h" | 13 #include "components/content_settings/core/common/content_settings_pattern.h" |
| 13 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" | 14 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" |
| 14 #include "ios/chrome/browser/content_settings/host_content_settings_map_factory.
h" | 15 #include "ios/chrome/browser/content_settings/host_content_settings_map_factory.
h" |
| 15 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_switch_item
.h" | 16 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_switch_item
.h" |
| 16 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_text_item.h
" | 17 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_text_item.h
" |
| 17 #import "ios/chrome/browser/ui/collection_view/collection_view_model.h" | 18 #import "ios/chrome/browser/ui/collection_view/collection_view_model.h" |
| 18 #import "ios/chrome/browser/ui/settings/settings_navigation_controller.h" | 19 #import "ios/chrome/browser/ui/settings/settings_navigation_controller.h" |
| 19 #import "ios/chrome/browser/ui/settings/utils/content_setting_backed_boolean.h" | 20 #import "ios/chrome/browser/ui/settings/utils/content_setting_backed_boolean.h" |
| 20 #include "ios/chrome/grit/ios_strings.h" | 21 #include "ios/chrome/grit/ios_strings.h" |
| 21 #import "ios/third_party/material_components_ios/src/components/Palettes/src/Mat
erialPalettes.h" | 22 #import "ios/third_party/material_components_ios/src/components/Palettes/src/Mat
erialPalettes.h" |
| (...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 271 entries[i].secondary_pattern == ContentSettingsPattern::Wildcard() && | 272 entries[i].secondary_pattern == ContentSettingsPattern::Wildcard() && |
| 272 entries[i].source != "preference") { | 273 entries[i].source != "preference") { |
| 273 continue; | 274 continue; |
| 274 } | 275 } |
| 275 // The content settings UI does not support secondary content settings | 276 // The content settings UI does not support secondary content settings |
| 276 // pattern yet. For content settings set through the content settings UI the | 277 // pattern yet. For content settings set through the content settings UI the |
| 277 // secondary pattern is by default a wildcard pattern. Hence users are not | 278 // secondary pattern is by default a wildcard pattern. Hence users are not |
| 278 // able to modify content settings with a secondary pattern other than the | 279 // able to modify content settings with a secondary pattern other than the |
| 279 // wildcard pattern. So only show settings that the user is able to modify. | 280 // wildcard pattern. So only show settings that the user is able to modify. |
| 280 if (entries[i].secondary_pattern == ContentSettingsPattern::Wildcard() && | 281 if (entries[i].secondary_pattern == ContentSettingsPattern::Wildcard() && |
| 281 entries[i].setting == CONTENT_SETTING_ALLOW) { | 282 entries[i].GetContentSetting() == CONTENT_SETTING_ALLOW) { |
| 282 _exceptions.AppendString(entries[i].primary_pattern.ToString()); | 283 _exceptions.AppendString(entries[i].primary_pattern.ToString()); |
| 283 } else { | 284 } else { |
| 284 LOG(ERROR) << "Secondary content settings patterns are not " | 285 LOG(ERROR) << "Secondary content settings patterns are not " |
| 285 << "supported by the content settings UI"; | 286 << "supported by the content settings UI"; |
| 286 } | 287 } |
| 287 } | 288 } |
| 288 } | 289 } |
| 289 | 290 |
| 290 - (void)populateExceptionsItems { | 291 - (void)populateExceptionsItems { |
| 291 CollectionViewModel* model = self.collectionViewModel; | 292 CollectionViewModel* model = self.collectionViewModel; |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 339 [[strongSelf collectionViewModel] | 340 [[strongSelf collectionViewModel] |
| 340 removeSectionWithIdentifier:SectionIdentifierExceptions]; | 341 removeSectionWithIdentifier:SectionIdentifierExceptions]; |
| 341 [[strongSelf collectionView] | 342 [[strongSelf collectionView] |
| 342 deleteSections:[NSIndexSet indexSetWithIndex:index]]; | 343 deleteSections:[NSIndexSet indexSetWithIndex:index]]; |
| 343 } | 344 } |
| 344 completion:nil]; | 345 completion:nil]; |
| 345 } | 346 } |
| 346 } | 347 } |
| 347 | 348 |
| 348 @end | 349 @end |
| OLD | NEW |