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

Side by Side Diff: chrome/browser/ui/content_settings/content_setting_bubble_model.h

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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_H_ 5 #ifndef CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_H_
6 #define CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_H_ 6 #define CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 std::string custom_link; 90 std::string custom_link;
91 bool custom_link_enabled; 91 bool custom_link_enabled;
92 std::string manage_link; 92 std::string manage_link;
93 MediaMenuMap media_menus; 93 MediaMenuMap media_menus;
94 std::string learn_more_link; 94 std::string learn_more_link;
95 95
96 private: 96 private:
97 DISALLOW_COPY_AND_ASSIGN(BubbleContent); 97 DISALLOW_COPY_AND_ASSIGN(BubbleContent);
98 }; 98 };
99 99
100 // Returns a vector of the Supported bubble types.
msw 2015/09/08 18:40:46 nit: s/vector/set/ and un-capitalize "supported"
raymes 2015/09/09 01:02:09 Oops, thanks. Done.
101 static const std::set<ContentSettingsType>& GetSupportedBubbleTypes();
102
100 static ContentSettingBubbleModel* CreateContentSettingBubbleModel( 103 static ContentSettingBubbleModel* CreateContentSettingBubbleModel(
101 Delegate* delegate, 104 Delegate* delegate,
102 content::WebContents* web_contents, 105 content::WebContents* web_contents,
103 Profile* profile, 106 Profile* profile,
104 ContentSettingsType content_type); 107 ContentSettingsType content_type);
105 108
106 ~ContentSettingBubbleModel() override; 109 ~ContentSettingBubbleModel() override;
107 110
108 ContentSettingsType content_type() const { return content_type_; } 111 ContentSettingsType content_type() const { return content_type_; }
109 112
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 void IgnoreProtocolHandler(); 227 void IgnoreProtocolHandler();
225 void ClearOrSetPreviousHandler(); 228 void ClearOrSetPreviousHandler();
226 229
227 int selected_item_; 230 int selected_item_;
228 ProtocolHandlerRegistry* registry_; 231 ProtocolHandlerRegistry* registry_;
229 ProtocolHandler pending_handler_; 232 ProtocolHandler pending_handler_;
230 ProtocolHandler previous_handler_; 233 ProtocolHandler previous_handler_;
231 }; 234 };
232 235
233 #endif // CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_H_ 236 #endif // CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698