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

Side by Side Diff: ios/chrome/browser/ui/settings/block_popups_collection_view_controller.mm

Issue 2938163002: Store base::Value in ContentSettingPatternSource instead of an enum (Closed)
Patch Set: ps Created 3 years, 6 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 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_pattern.h" 12 #include "components/content_settings/core/common/content_settings_pattern.h"
13 #include "components/content_settings/core/common/content_settings_utils.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"
22 #include "ui/base/l10n/l10n_util.h" 23 #include "ui/base/l10n/l10n_util.h"
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 content_settings::ValueToContentSetting(
283 entries[i].setting_value.get()) == CONTENT_SETTING_ALLOW) {
282 _exceptions.AppendString(entries[i].primary_pattern.ToString()); 284 _exceptions.AppendString(entries[i].primary_pattern.ToString());
283 } else { 285 } else {
284 LOG(ERROR) << "Secondary content settings patterns are not " 286 LOG(ERROR) << "Secondary content settings patterns are not "
285 << "supported by the content settings UI"; 287 << "supported by the content settings UI";
286 } 288 }
287 } 289 }
288 } 290 }
289 291
290 - (void)populateExceptionsItems { 292 - (void)populateExceptionsItems {
291 CollectionViewModel* model = self.collectionViewModel; 293 CollectionViewModel* model = self.collectionViewModel;
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 [[strongSelf collectionViewModel] 341 [[strongSelf collectionViewModel]
340 removeSectionWithIdentifier:SectionIdentifierExceptions]; 342 removeSectionWithIdentifier:SectionIdentifierExceptions];
341 [[strongSelf collectionView] 343 [[strongSelf collectionView]
342 deleteSections:[NSIndexSet indexSetWithIndex:index]]; 344 deleteSections:[NSIndexSet indexSetWithIndex:index]];
343 } 345 }
344 completion:nil]; 346 completion:nil];
345 } 347 }
346 } 348 }
347 349
348 @end 350 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698