More TOUCH_UI hacks and constant removal. And TODO(saintlou) cleanup.

chrome/browser/ui/toolbar/wrench_menu_model_chromeos.cc

Index: chrome/browser/ui/toolbar/wrench_menu_model_chromeos.cc
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model_chromeos.cc b/chrome/browser/ui/toolbar/wrench_menu_model_chromeos.cc
index 01232a81d008411d0e6dfcb7a6aaea50efbf7fc9..d50391dff7c604997e85581d0c264852261fc8d6 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model_chromeos.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model_chromeos.cc
@@ -16,7 +16,6 @@
 #include "ui/base/resource/resource_bundle.h"
 
 void WrenchMenuModel::Build() {
-#if !defined(TOUCH_UI)
   AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB);
   AddItemWithStringId(IDC_NEW_WINDOW, IDS_NEW_WINDOW);
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession))
@@ -30,7 +29,6 @@ void WrenchMenuModel::Build() {
 
   AddSeparator();
   AddItemWithStringId(IDC_SAVE_PAGE, IDS_SAVE_PAGE);
-#endif // !TOUCH_UI
   AddItemWithStringId(IDC_FIND, IDS_FIND);
   AddItemWithStringId(IDC_PRINT, IDS_PRINT);
 
@@ -44,9 +42,8 @@ void WrenchMenuModel::Build() {
   AddSubMenuWithStringId(IDC_BOOKMARKS_MENU, IDS_BOOKMARKS_MENU,
       bookmark_sub_menu_model_.get());
   AddItemWithStringId(IDC_SHOW_HISTORY, IDS_SHOW_HISTORY);
-#if !defined(TOUCH_UI)
   AddItemWithStringId(IDC_SHOW_DOWNLOADS, IDS_SHOW_DOWNLOADS);
-#endif // !TOUCH_UI
+
   AddSeparator();
 
   AddItemWithStringId(IDC_OPTIONS, IDS_SETTINGS);