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

Side by Side Diff: chrome/browser/ui/website_settings/website_settings.h

Issue 2521173004: Remove SetSelectedTab() and deprecate unused WebsiteSettingsAction values. (Closed)
Patch Set: Created 4 years 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_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_ 5 #ifndef CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_
6 #define CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_ 6 #define CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
10 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 10 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 SITE_IDENTITY_STATUS_MALWARE, 82 SITE_IDENTITY_STATUS_MALWARE,
83 SITE_IDENTITY_STATUS_SOCIAL_ENGINEERING, 83 SITE_IDENTITY_STATUS_SOCIAL_ENGINEERING,
84 SITE_IDENTITY_STATUS_UNWANTED_SOFTWARE, 84 SITE_IDENTITY_STATUS_UNWANTED_SOFTWARE,
85 }; 85 };
86 86
87 // UMA statistics for WebsiteSettings. Do not reorder or remove existing 87 // UMA statistics for WebsiteSettings. Do not reorder or remove existing
88 // fields. A Java counterpart will be generated for this enum. 88 // fields. A Java counterpart will be generated for this enum.
89 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.pageinfo 89 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.pageinfo
90 enum WebsiteSettingsAction { 90 enum WebsiteSettingsAction {
91 WEBSITE_SETTINGS_OPENED = 0, 91 WEBSITE_SETTINGS_OPENED = 0,
92 WEBSITE_SETTINGS_PERMISSIONS_TAB_SELECTED = 1, 92 // No longer used; indicated actions for to the old version of Page Info
msw 2016/11/29 18:26:03 nit: "for to"
lgarron 2016/12/16 05:46:59 Done.
93 WEBSITE_SETTINGS_CONNECTION_TAB_SELECTED = 2, 93 // that had a "Permissions" tab and a "Connection" tab.
94 WEBSITE_SETTINGS_CONNECTION_TAB_SHOWN_IMMEDIATELY = 3, 94 // WEBSITE_SETTINGS_PERMISSIONS_TAB_SELECTED = 1,
msw 2016/11/29 18:31:01 Do you need to remove usage from website_settings_
lgarron 2016/12/16 05:46:59 Done.
95 // WEBSITE_SETTINGS_CONNECTION_TAB_SELECTED = 2,
96 // WEBSITE_SETTINGS_CONNECTION_TAB_SHOWN_IMMEDIATELY = 3,
95 WEBSITE_SETTINGS_COOKIES_DIALOG_OPENED = 4, 97 WEBSITE_SETTINGS_COOKIES_DIALOG_OPENED = 4,
96 WEBSITE_SETTINGS_CHANGED_PERMISSION = 5, 98 WEBSITE_SETTINGS_CHANGED_PERMISSION = 5,
97 WEBSITE_SETTINGS_CERTIFICATE_DIALOG_OPENED = 6, 99 WEBSITE_SETTINGS_CERTIFICATE_DIALOG_OPENED = 6,
98 // No longer used; indicated a UI viewer for SCTs. 100 // No longer used; indicated a UI viewer for SCTs.
99 // WEBSITE_SETTINGS_TRANSPARENCY_VIEWER_OPENED = 7, 101 // WEBSITE_SETTINGS_TRANSPARENCY_VIEWER_OPENED = 7,
100 WEBSITE_SETTINGS_CONNECTION_HELP_OPENED = 8, 102 WEBSITE_SETTINGS_CONNECTION_HELP_OPENED = 8,
101 WEBSITE_SETTINGS_SITE_SETTINGS_OPENED = 9, 103 WEBSITE_SETTINGS_SITE_SETTINGS_OPENED = 9,
102 WEBSITE_SETTINGS_SECURITY_DETAILS_OPENED = 10, 104 // No longer used; opened the DevTools Security panel
msw 2016/11/29 18:26:03 nit: trailing period
lgarron 2016/12/16 05:46:59 Done.
105 // (or the certificate viewer, if DevTools was enabled.)
106 // WEBSITE_SETTINGS_SECURITY_DETAILS_OPENED = 10,
msw 2016/11/29 18:31:01 Do you need to remove usage from WebsiteSettingsPo
lgarron 2016/12/16 05:46:59 Hmm. I guess we want that metric to stick around w
103 WEBSITE_SETTINGS_COUNT 107 WEBSITE_SETTINGS_COUNT
104 }; 108 };
105 109
106 struct ChooserUIInfo { 110 struct ChooserUIInfo {
107 ContentSettingsType content_settings_type; 111 ContentSettingsType content_settings_type;
108 ChooserContextBase* (*get_context)(Profile*); 112 ChooserContextBase* (*get_context)(Profile*);
109 int blocked_icon_id; 113 int blocked_icon_id;
110 int allowed_icon_id; 114 int allowed_icon_id;
111 int label_string_id; 115 int label_string_id;
112 int delete_tooltip_string_id; 116 int delete_tooltip_string_id;
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 bool did_revoke_user_ssl_decisions_; 238 bool did_revoke_user_ssl_decisions_;
235 239
236 Profile* profile_; 240 Profile* profile_;
237 241
238 security_state::SecurityLevel security_level_; 242 security_state::SecurityLevel security_level_;
239 243
240 DISALLOW_COPY_AND_ASSIGN(WebsiteSettings); 244 DISALLOW_COPY_AND_ASSIGN(WebsiteSettings);
241 }; 245 };
242 246
243 #endif // CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_ 247 #endif // CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698