Removed TOUCH_UI (mostly constants) from chrome/browser/ui/views.

chrome/browser/ui/views/toolbar_view.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/toolbar_view.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 61 matching lines @@
 static const int kPulsateEveryMs = 8000;
 
 static const int kPopupTopSpacingNonGlass = 3;
 static const int kPopupBottomSpacingNonGlass = 2;
 static const int kPopupBottomSpacingGlass = 1;
 
 // Top margin for the wrench menu badges (badge is placed in the upper right
 // corner of the wrench menu).
 static const int kBadgeTopMargin = 2;
 
-#if defined(TOUCH_UI)
-// Extra vertical padding above the location bar.
-static const int kExtraVerticalPadding = 3;
-#endif
-
 static SkBitmap* kPopupBackgroundEdge = NULL;
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, public:
 
 ToolbarView::ToolbarView(Browser* browser)
     : model_(browser->toolbar_model()),
       back_(NULL),
       forward_(NULL),
       reload_(NULL),
@@ skipping 437 matching lines @@
   } else {
     home_->SetVisible(false);
     home_->SetBounds(reload_->x() + reload_->width(), child_y, 0, child_height);
   }
 
   int browser_actions_width = browser_actions_->GetPreferredSize().width();
   int app_menu_width = app_menu_->GetPreferredSize().width();
   int location_x = home_->x() + home_->width() + kStandardSpacing;
   int available_width = width() - kEdgeSpacing - app_menu_width -
       browser_actions_width - location_x;
-
-#if defined(TOUCH_UI)
-  // Center the location bar vertically.
-  int location_y = std::min(child_y + kExtraVerticalPadding, height());
-  int location_bar_height = std::max(height() - 2 * location_y, 0);
-#else
   int location_y = child_y;
   int location_bar_height = child_height;
-#endif
 
   location_bar_->SetBounds(location_x, location_y, std::max(available_width, 0),
                            location_bar_height);
 
   browser_actions_->SetBounds(location_bar_->x() + location_bar_->width(), 0,
                               browser_actions_width, height());
   // The browser actions need to do a layout explicitly, because when an
   // extension is loaded/unloaded/changed, BrowserActionContainer removes and
   // re-adds everything, regardless of whether it has a page action. For a
   // page action, browser action bounds do not change, as a result of which
@@ skipping 179 matching lines @@
     accname_app = l10n_util::GetStringFUTF16(
         IDS_ACCNAME_APP_UPGRADE_RECOMMENDED, accname_app);
   }
   app_menu_->SetAccessibleName(accname_app);
 
   app_menu_->SetIcon(GetAppMenuIcon(views::CustomButton::BS_NORMAL));
   app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::BS_HOT));
   app_menu_->SetPushedIcon(GetAppMenuIcon(views::CustomButton::BS_PUSHED));
   SchedulePaint();
 }