From 1bfa0ec1269ce7fedf37d665f4972f4faf052b45 Mon Sep 17 00:00:00 2001 From: "harrym@chromium.org" Date: Mon, 6 May 2013 07:58:48 +0000 Subject: Removed excess menu lines with alt-location field trial. BUG=234115 TEST=Run chrome with cl option --force-fieldtrials=SendFeedbackLinkLocation/alt-location/ and confirm visually. Review URL: https://chromiumcodereview.appspot.com/14884004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198408 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ui/toolbar/wrench_menu_model.cc | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc index 6d7106f..4a2e9e0 100644 --- a/chrome/browser/ui/toolbar/wrench_menu_model.cc +++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc @@ -639,25 +639,23 @@ void WrenchMenuModel::Build(bool is_new_menu) { tools_menu_model_.get()); } +#if !defined(OS_CHROMEOS) + // For Send Feedback Link experiment (crbug.com/169339). + if (chrome::UseAlternateSendFeedbackLocation()) + AddItemWithStringId(IDC_FEEDBACK, + chrome::GetSendFeedbackMenuLabelID()); +#endif + bool show_exit_menu = browser_defaults::kShowExitMenuItem; #if defined(OS_WIN) && defined(USE_AURA) if (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) show_exit_menu = false; #endif - if (show_exit_menu) - AddSeparator(ui::NORMAL_SEPARATOR); -#if !defined(OS_CHROMEOS) - // For Send Feedback Link experiment (crbug.com/169339). - if (chrome::UseAlternateSendFeedbackLocation()) { - AddItemWithStringId(IDC_FEEDBACK, - chrome::GetSendFeedbackMenuLabelID()); + if (show_exit_menu) { AddSeparator(ui::NORMAL_SEPARATOR); - } -#endif - - if (show_exit_menu) AddItemWithStringId(IDC_EXIT, IDS_EXIT); + } } void WrenchMenuModel::AddGlobalErrorMenuItems() { -- cgit v1.1