summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlaforge@chromium.org <laforge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-21 17:45:42 +0000
committerlaforge@chromium.org <laforge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-21 17:45:42 +0000
commit23ff08cb8c428a895da06cbf6522396443e0b9dd (patch)
treeed8952f0deb81d113fe1ae7a51df2e5bcb250415
parentf2855fcac996e38d70d22a45db561667b8a6bed2 (diff)
downloadchromium_src-23ff08cb8c428a895da06cbf6522396443e0b9dd.zip
chromium_src-23ff08cb8c428a895da06cbf6522396443e0b9dd.tar.gz
chromium_src-23ff08cb8c428a895da06cbf6522396443e0b9dd.tar.bz2
Merge 60060 - Disable feedback menu for Chrome.
TBR=zelidrag@chromium.org BUG=55790 TEST=Report Bug Menu doesn't show up anymore; as with M6 Review URL: http://codereview.chromium.org/3453015 TBR=rkc@chromium.org Review URL: http://codereview.chromium.org/3436023 git-svn-id: svn://svn.chromium.org/chrome/branches/517/src@60071 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/wrench_menu_model.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/wrench_menu_model.cc b/chrome/browser/wrench_menu_model.cc
index abea856..f25e756 100644
--- a/chrome/browser/wrench_menu_model.cc
+++ b/chrome/browser/wrench_menu_model.cc
@@ -154,8 +154,10 @@ void ToolsMenuModel::Build(Browser* browser) {
AddItemWithStringId(IDC_CLEAR_BROWSING_DATA, IDS_CLEAR_BROWSING_DATA);
AddSeparator();
+#if defined(OS_CHROMEOS)
AddItemWithStringId(IDC_REPORT_BUG, IDS_REPORT_BUG);
AddSeparator();
+#endif
encoding_menu_model_.reset(new EncodingMenuModel(browser));
AddSubMenuWithStringId(IDC_ENCODING_MENU, IDS_ENCODING_MENU,