Commit c6f02931 authored by Caitlin Fischer's avatar Caitlin Fischer Committed by Commit Bot

Clean up the IncludeBetaForumMenuItem feature.

The feature was added here: https://codereview.chromium.org/2882013002.

Bug: 1126640
Change-Id: Ie5d20b449c5144b1fbf163a6e0947cdd52dca56f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2427030Reviewed-by: default avatarPeter Kasting <pkasting@chromium.org>
Reviewed-by: default avatarRobert Kaplow <rkaplow@chromium.org>
Reviewed-by: default avatarBret Sepulveda <bsep@chromium.org>
Commit-Queue: Caitlin Fischer <caitlinfischer@google.com>
Cr-Commit-Position: refs/heads/master@{#815371}
parent f2e2db3a
...@@ -168,9 +168,6 @@ void ZoomMenuModel::Build() { ...@@ -168,9 +168,6 @@ void ZoomMenuModel::Build() {
// HelpMenuModel // HelpMenuModel
// Only used in branded builds. // Only used in branded builds.
const base::Feature kIncludeBetaForumMenuItem{
"IncludeBetaForumMenuItem", base::FEATURE_DISABLED_BY_DEFAULT};
class HelpMenuModel : public ui::SimpleMenuModel { class HelpMenuModel : public ui::SimpleMenuModel {
public: public:
HelpMenuModel(ui::SimpleMenuModel::Delegate* delegate, Browser* browser) HelpMenuModel(ui::SimpleMenuModel::Delegate* delegate, Browser* browser)
...@@ -191,8 +188,6 @@ class HelpMenuModel : public ui::SimpleMenuModel { ...@@ -191,8 +188,6 @@ class HelpMenuModel : public ui::SimpleMenuModel {
AddItem(IDC_ABOUT, l10n_util::GetStringUTF16(IDS_ABOUT)); AddItem(IDC_ABOUT, l10n_util::GetStringUTF16(IDS_ABOUT));
#endif #endif
AddItemWithStringId(IDC_HELP_PAGE_VIA_MENU, help_string_id); AddItemWithStringId(IDC_HELP_PAGE_VIA_MENU, help_string_id);
if (base::FeatureList::IsEnabled(kIncludeBetaForumMenuItem))
AddItem(IDC_SHOW_BETA_FORUM, l10n_util::GetStringUTF16(IDS_BETA_FORUM));
if (browser_defaults::kShowHelpMenuItemIcon) { if (browser_defaults::kShowHelpMenuItemIcon) {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
SetIcon(GetIndexOfCommandId(IDC_HELP_PAGE_VIA_MENU), SetIcon(GetIndexOfCommandId(IDC_HELP_PAGE_VIA_MENU),
......
...@@ -3532,24 +3532,6 @@ ...@@ -3532,24 +3532,6 @@
] ]
} }
], ],
"IncludeBetaForumMenuItem": [
{
"platforms": [
"chromeos",
"linux",
"mac",
"windows"
],
"experiments": [
{
"name": "Enabled",
"enable_features": [
"IncludeBetaForumMenuItem"
]
}
]
}
],
"IncompatibleApplicationsWarning": [ "IncompatibleApplicationsWarning": [
{ {
"platforms": [ "platforms": [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment