Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8475)

Unified Diff: chrome/browser/ui/toolbar/wrench_menu_model.cc

Issue 12490012: Send Feedback Experiment (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: removed duplicate constant strings Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..83411b7182b863ad57a29286025cae9941d73eed 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::send_feedback_experiment::UseAlternateLocation()) {
+ AddItemWithStringId(IDC_FEEDBACK,
+ chrome::send_feedback_experiment::GetMenuLabelID());
+ AddSeparator(ui::NORMAL_SEPARATOR);
+ }
+#else
+ if (chrome::send_feedback_experiment::UseAlternateLocation()) {
+ AddItemWithStringId(IDC_FEEDBACK,
+ chrome::send_feedback_experiment::GetMenuLabelID());
+ 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::send_feedback_experiment::UseAlternateLocation()) {
+ AddItemWithStringId(IDC_FEEDBACK,
+ chrome::send_feedback_experiment::GetMenuLabelID());
+ }
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::send_feedback_experiment::UseAlternateLocation()) {
+ AddItemWithStringId(IDC_FEEDBACK,
+ chrome::send_feedback_experiment::GetMenuLabelID());
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()) {

Powered by Google App Engine
This is Rietveld 408576698