summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorharrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-06 07:58:48 +0000
committerharrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-06 07:58:48 +0000
commit1bfa0ec1269ce7fedf37d665f4972f4faf052b45 (patch)
tree5ba3d6826dae560a75179fc0b7d5fea28df15112
parent76f1066e36aa9475ef8ffb0bb58a2be1bcc764e5 (diff)
downloadchromium_src-1bfa0ec1269ce7fedf37d665f4972f4faf052b45.zip
chromium_src-1bfa0ec1269ce7fedf37d665f4972f4faf052b45.tar.gz
chromium_src-1bfa0ec1269ce7fedf37d665f4972f4faf052b45.tar.bz2
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
-rw-r--r--chrome/browser/ui/toolbar/wrench_menu_model.cc20
1 files 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() {