Touch constants and dead code removal.

chrome/browser/defaults.cc

Index: chrome/browser/defaults.cc
diff --git a/chrome/browser/defaults.cc b/chrome/browser/defaults.cc
index ed5981b446347f88b9b52740c18c0e48294c670e..560a4c7ff7b4f1a9618299587ad6c05f287c9caa 100644
--- a/chrome/browser/defaults.cc
+++ b/chrome/browser/defaults.cc
@@ -78,30 +78,14 @@ const bool kBrowserAliveWithNoWindows = true;
 const bool kBrowserAliveWithNoWindows = false;
 #endif
 
-#ifdef TOUCH_UI
-const int kBookmarkBarHeight = 50;
-const int kNewtabBookmarkBarHeight = 72;
-// TouchUI issue with opening too many tabs.
-const int kMaxTabCount = 4;
-#else
 const int kBookmarkBarHeight = 28;
 const int kNewtabBookmarkBarHeight = 57;
 const int kMaxTabCount = INT_MAX;
-#endif
 
-#ifdef TOUCH_UI
-const ui::ResourceBundle::FontStyle kAssociatedNetworkFontStyle =
-    ui::ResourceBundle::LargeBoldFont;
-#else
 const ui::ResourceBundle::FontStyle kAssociatedNetworkFontStyle =
     ui::ResourceBundle::BoldFont;
-#endif
 
-#ifdef TOUCH_UI
-const int kInfoBarBorderPaddingVertical = 12;
-#else
 const int kInfoBarBorderPaddingVertical = 5;
-#endif
 
 bool bookmarks_enabled = true;