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

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

Issue 581583003: Remove flag --disable-genius-app since it's been public launched for several milestones (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « chrome/browser/ui/chrome_pages.cc ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 93d3c91ffed978c7c93f62e090409aff3f8d7ec7..0f54f6d3327330d2604d40bd3b73a8397a39271f 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -201,11 +201,8 @@ class WrenchMenuModel::HelpMenuModel : public ui::SimpleMenuModel {
void Build(Browser* browser) {
int help_string_id = IDS_HELP_PAGE;
#if defined(OS_CHROMEOS) && defined(OFFICIAL_BUILD)
- if (!CommandLine::ForCurrentProcess()->HasSwitch(
- chromeos::switches::kDisableGeniusApp)) {
- help_string_id = IDS_GET_HELP;
- }
-#endif
+ help_string_id = IDS_GET_HELP;
+#else
sky 2014/09/18 13:03:24 This isn't the same as the old code. I was saying
cylee1 2014/09/18 13:25:59 sorry, mistake...
AddItemWithStringId(IDC_HELP_PAGE_VIA_MENU, help_string_id);
if (browser_defaults::kShowHelpMenuItemIcon) {
ui::ResourceBundle& rb = ResourceBundle::GetSharedInstance();
@@ -214,6 +211,7 @@ class WrenchMenuModel::HelpMenuModel : public ui::SimpleMenuModel {
}
AddItemWithStringId(IDC_FEEDBACK, IDS_FEEDBACK);
+#endif
}
DISALLOW_COPY_AND_ASSIGN(HelpMenuModel);
« no previous file with comments | « chrome/browser/ui/chrome_pages.cc ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698