Send Feedback Experiment

chrome/browser/ui/toolbar/wrench_menu_model.cc

Index: chrome/browser/ui/toolbar/wrench_menu_model.cc
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc
index 37f0f5cba809654208bb7f7863ac098461a48ab7..c3bc26d65bb3c13422a375a03ab3698b7ae73cb5 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -30,6 +30,7 @@
 #include "chrome/browser/ui/global_error/global_error.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
+#include "chrome/browser/ui/send_feedback_experiment.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/bookmark_sub_menu_model.h"
 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
@@ -85,6 +86,7 @@ string16 GetUpgradeDialogMenuItemName() {
     return l10n_util::GetStringUTF16(IDS_UPDATE_NOW);
   }
 }
+
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -202,8 +204,17 @@ void ToolsMenuModel::Build(Browser* browser) {
 
 #if !defined(OS_CHROMEOS)
   // Show IDC_FEEDBACK in "Tools" menu for non-ChromeOS platforms.
-  AddItemWithStringId(IDC_FEEDBACK, IDS_FEEDBACK);
-  AddSeparator(ui::NORMAL_SEPARATOR);
+  if (!chrome::UseAlternateSendFeedbackLocation()) {
+    AddItemWithStringId(IDC_FEEDBACK,
+                        chrome::GetSendFeedbackMenuLabelID());
+    AddSeparator(ui::NORMAL_SEPARATOR);
+  }
+#else
+  if (chrome::UseAlternateSendFeedbackLocation()) {
+    AddItemWithStringId(IDC_FEEDBACK,
+                        chrome::GetSendFeedbackMenuLabelID());
+    AddSeparator(ui::NORMAL_SEPARATOR);
+  }
 #endif
 
   encoding_menu_model_.reset(new EncodingMenuModel(browser));
@@ -610,8 +621,11 @@ void WrenchMenuModel::Build(bool is_new_menu, bool supports_new_separators) {
     }
   }
 
-  if (browser_defaults::kShowFeedbackMenuItem)
-    AddItemWithStringId(IDC_FEEDBACK, IDS_FEEDBACK);
+  if (browser_defaults::kShowFeedbackMenuItem &&
+      !chrome::UseAlternateSendFeedbackLocation()) {
+    AddItemWithStringId(IDC_FEEDBACK,
+                        chrome::GetSendFeedbackMenuLabelID());
+  }
 
   AddGlobalErrorMenuItems();
 
@@ -625,10 +639,20 @@ void WrenchMenuModel::Build(bool is_new_menu, bool supports_new_separators) {
   if (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH)
     show_exit_menu = false;
 #endif
-  if (show_exit_menu) {
+  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());
     AddSeparator(ui::NORMAL_SEPARATOR);
-    AddItemWithStringId(IDC_EXIT, IDS_EXIT);
   }
+#endif
+
+  if (show_exit_menu)
+    AddItemWithStringId(IDC_EXIT, IDS_EXIT);
 
   if (is_new_menu && supports_new_separators &&
       !ui::NativeTheme::IsNewMenuStyleEnabled()) {