Send Feedback Experiment

chrome/browser/ui/toolbar/wrench_menu_model.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/command_line.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/signin_ui_util.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #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"
 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/profiling.h"
 #include "content/public/browser/host_zoom_map.h"
@@ skipping 35 matching lines @@
 // state.
 string16 GetUpgradeDialogMenuItemName() {
   if (UpgradeDetector::GetInstance()->is_outdated_install()) {
     return l10n_util::GetStringFUTF16(
         IDS_UPGRADE_BUBBLE_MENU_ITEM,
         l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME));
   } else {
     return l10n_util::GetStringUTF16(IDS_UPDATE_NOW);
   }
 }
+
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // EncodingMenuModel
 
 EncodingMenuModel::EncodingMenuModel(Browser* browser)
     : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)),
       browser_(browser) {
   Build();
 }
@@ skipping 97 matching lines @@
 
   if (chrome::CanOpenTaskManager())
     AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
 
   AddItemWithStringId(IDC_CLEAR_BROWSING_DATA, IDS_CLEAR_BROWSING_DATA);
 
   AddSeparator(ui::NORMAL_SEPARATOR);
 
 #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));
   AddSubMenuWithStringId(IDC_ENCODING_MENU, IDS_ENCODING_MENU,
                          encoding_menu_model_.get());
   AddItemWithStringId(IDC_VIEW_SOURCE, IDS_VIEW_SOURCE);
   AddItemWithStringId(IDC_DEV_TOOLS, IDS_DEV_TOOLS);
   AddItemWithStringId(IDC_DEV_TOOLS_CONSOLE, IDS_DEV_TOOLS_CONSOLE);
 
 #if defined(ENABLE_PROFILING) && !defined(NO_TCMALLOC)
@@ skipping 386 matching lines @@
   if (!is_new_menu) {
     AddItemWithStringId(IDC_HELP_PAGE_VIA_MENU, IDS_HELP_PAGE);
 
     if (browser_defaults::kShowHelpMenuItemIcon) {
       ui::ResourceBundle& rb = ResourceBundle::GetSharedInstance();
       SetIcon(GetIndexOfCommandId(IDC_HELP_PAGE_VIA_MENU),
               rb.GetNativeImageNamed(IDR_HELP_MENU));
     }
   }
 
-  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();
 
   if (is_new_menu) {
     AddSubMenuWithStringId(IDC_ZOOM_MENU, IDS_MORE_TOOLS_MENU,
                            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;
+  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);
+  }
 #endif
-  if (show_exit_menu) {
-    AddSeparator(ui::NORMAL_SEPARATOR);
+
+  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()) {
     AddSeparator(ui::SPACING_SEPARATOR);
   }
 }
 
 void WrenchMenuModel::AddGlobalErrorMenuItems() {
   // TODO(sail): Currently we only build the wrench menu once per browser
   // window. This means that if a new error is added after the menu is built
@@ skipping 82 matching lines @@
             &enable_increment, &enable_decrement);
   }
   zoom_label_ = l10n_util::GetStringFUTF16(
       IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
 }
 
 void WrenchMenuModel::OnZoomLevelChanged(
     const content::HostZoomMap::ZoomLevelChange& change) {
   UpdateZoomControls();
 }