chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm - Issue 1312053006: Remove CONTENT_SETTINGS_NUM_TYPES (part 2)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

Issue 1312053006: Remove CONTENT_SETTINGS_NUM_TYPES (part 2) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@website-settings-registry-4

Patch Set: Created 5 years, 3 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm ('K') | « chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm ('k') | chrome/browser/ui/content_settings/content_setting_bubble_model.h » ('j') | chrome/browser/ui/content_settings/content_setting_bubble_model.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

index a72928503a1fde8b0108c8703c9b5da175e02c1c..9b58dbcb25ba1cc0b83a0d9bf26a5bd52492f726 100644

--- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

+++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

@@ -104,9 +104,8 @@ LocationBarViewMac::LocationBarViewMac(AutocompleteTextField* field,

new ManagePasswordsDecoration(command_updater, this)),

browser_(browser),

weak_ptr_factory_(this) {

- for (size_t i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {

- DCHECK_EQ(i, content_setting_decorations_.size());

- ContentSettingsType type = static_cast<ContentSettingsType>(i);

+ for (ContentSettingsType type :

+ ContentSettingBubbleModel::GetSupportedBubbleTypes()) {

content_setting_decorations_.push_back(

new ContentSettingDecoration(type, this, profile));

}