Remove touch layout

chrome/browser/ui/views/location_bar/location_bar_layout.cc

 // Copyright (c) 2012 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/location_bar/location_bar_layout.h"
 
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/view.h"
 
@@ skipping 85 matching lines @@
   decorations_.push_back(new LocationBarDecoration(
       y, height, auto_collapse, max_fraction, edge_item_padding, item_padding,
       builtin_padding, view));
 }
 
 void LocationBarLayout::AddDecoration(int y,
                                       int height,
                                       int builtin_padding,
                                       views::View* view) {
   decorations_.push_back(new LocationBarDecoration(
-      y, height, false, 0, LocationBarView::GetItemPadding(),
-      LocationBarView::GetItemPadding(), builtin_padding, view));
+      y, height, false, 0, LocationBarView::kItemPadding,
+      LocationBarView::kItemPadding, builtin_padding, view));
 }
 
 void LocationBarLayout::LayoutPass1(int* entry_width) {
   bool first_item = true;
   for (Decorations::iterator i(decorations_.begin()); i != decorations_.end();
        ++i) {
     // Autocollapsing decorations are ignored in this pass.
     if (!(*i)->auto_collapse) {
       *entry_width -= -2 * (*i)->builtin_padding +
           (first_item ? (*i)->edge_item_padding : (*i)->item_padding);
@@ skipping 57 matching lines @@
         (*i)->builtin_padding);
     if (position_ == LEFT_EDGE) {
       bounds->set_x(
           bounds->x() + padding + (*i)->computed_width - (*i)->builtin_padding);
     }
   }
   bounds->set_width(bounds->width() - item_edit_padding_);
   if (position_ == LEFT_EDGE)
     bounds->set_x(bounds->x() + item_edit_padding_);
 }