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 d2f1efee2f58b7dbfd99dc9d3eadec3b981553a7..44030c64ca3d85aa0677403b2068da69064dcce6 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,19 @@ 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::send_feedback_experiment::UseAlternateLocation()) {
+    AddItemWithStringId(IDC_FEEDBACK,
+                        chrome::send_feedback_experiment::UseAlternateText() ?
+                          IDS_FEEDBACK_ALT : IDS_FEEDBACK);

[sky, 2013/03/15 23:23:42]

indent 4 (same on 217)

[Harry McCleave, 2013/03/19 03:11:32]

Done.

+    AddSeparator(ui::NORMAL_SEPARATOR);
+  }
+#else
+  if (chrome::send_feedback_experiment::UseAlternateLocation()) {
+    AddItemWithStringId(IDC_FEEDBACK,
+                        chrome::send_feedback_experiment::UseAlternateText() ?
+                          IDS_FEEDBACK_ALT : IDS_FEEDBACK);
+    AddSeparator(ui::NORMAL_SEPARATOR);
+  }
 #endif
 
   encoding_menu_model_.reset(new EncodingMenuModel(browser));
@@ -610,8 +623,12 @@ 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::send_feedback_experiment::UseAlternateLocation()) {
+    AddItemWithStringId(IDC_FEEDBACK,
+                        chrome::send_feedback_experiment::UseAlternateText() ?
+                            IDS_FEEDBACK_ALT : IDS_FEEDBACK);
+  }
 
   AddGlobalErrorMenuItems();
 
@@ -620,15 +637,21 @@ void WrenchMenuModel::Build(bool is_new_menu, bool supports_new_separators) {
                            tools_menu_model_.get());
   }
 
-  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) {
+  if (browser_defaults::kShowExitMenuItem)
+    AddSeparator(ui::NORMAL_SEPARATOR);
+
+#if !defined(OS_CHROMEOS)
+  // For Send Feedback Link experiment (crbug.com/169339).
+  if (chrome::send_feedback_experiment::UseAlternateLocation()) {
+    AddItemWithStringId(IDC_FEEDBACK,
+                        chrome::send_feedback_experiment::UseAlternateText() ?

[sky, 2013/03/15 23:23:42]

You have this text four times, how about a GetAlternativeTextId() function or
something (in this file).

[Harry McCleave, 2013/03/19 03:11:32]

Done.

+                            IDS_FEEDBACK_ALT : IDS_FEEDBACK);
     AddSeparator(ui::NORMAL_SEPARATOR);
-    AddItemWithStringId(IDC_EXIT, IDS_EXIT);
   }
+#endif
+
+  if (browser_defaults::kShowExitMenuItem)

[sky, 2013/03/15 23:23:42]

Doesn't this miss the logic on 625 old?

[Harry McCleave, 2013/03/19 03:11:32]

Ah re-base my old nemesis (done).

+    AddItemWithStringId(IDC_EXIT, IDS_EXIT);
 
   if (is_new_menu && supports_new_separators &&
       !ui::NativeTheme::IsNewMenuStyleEnabled()) {