Remove touch layout

chrome/browser/ui/views/location_bar/location_bar_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 127 matching lines @@
   };
 
   LocationBarView(Browser* browser,
                   Profile* profile,
                   CommandUpdater* command_updater,
                   Delegate* delegate,
                   bool is_popup_mode);
 
   virtual ~LocationBarView();
 
-  // Uses GetBuiltInHorizontalPaddingForChildViews() to optionally add
-  // additional padding (via an empty border) to |view|. This should be called
-  // during creation on all child views which are potentially touchable so that
-  // when touch is enabled they will have sufficient padding.
-  static void InitTouchableLocationBarChildView(views::View* view);
-
   // Initializes the LocationBarView.
   void Init();
 
   // True if this instance has been initialized by calling Init, which can only
   // be called when the receiving instance is attached to a view container.
   bool IsInitialized() const;
 
   // Returns the appropriate color for the desired kind, based on the user's
   // system theme.
   SkColor GetColor(ToolbarModel::SecurityLevel security_level,
@@ skipping 88 matching lines @@
   int GetInternalHeight(bool use_preferred_size);
 
   // Returns the position and width that the popup should be, and also the left
   // edge that the results should align themselves to (which will leave some
   // border on the left of the popup).
   void GetOmniboxPopupPositioningInfo(gfx::Point* top_left_screen_coord,
                                       int* popup_width,
                                       int* left_margin,
                                       int* right_margin);
 
-  // Space between items in the location bar, as well as between items and the
-  // edges.
-  static int GetItemPadding();
-
   // LocationBar:
   virtual void FocusLocation(bool select_all) OVERRIDE;
   virtual void Revert() OVERRIDE;
   virtual OmniboxView* GetOmniboxView() OVERRIDE;
 
   // views::View:
   virtual bool HasFocus() const OVERRIDE;
   virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void Layout() OVERRIDE;
 
   // OmniboxEditController:
   virtual void Update(const content::WebContents* contents) OVERRIDE;
   virtual void ShowURL() OVERRIDE;
   virtual ToolbarModel* GetToolbarModel() OVERRIDE;
   virtual content::WebContents* GetWebContents() OVERRIDE;
 
   // Thickness of the edges of the omnibox background images, in normal mode.
   static const int kNormalEdgeThickness;
   // The same, but for popup mode.
   static const int kPopupEdgeThickness;
+  // Space between items in the location bar, as well as between items and the
+  // edges.
+  static const int kItemPadding;
   // Amount of padding built into the standard omnibox icons.
   static const int kIconInternalPadding;
   // Amount of padding to place between the origin chip and the leading edge of
   // the location bar.
   static const int kOriginChipEdgeItemPadding;
   // Amount of padding built into the origin chip.
   static const int kOriginChipBuiltinPadding;
   // Space between the edge and a bubble.
   static const int kBubblePadding;
 
  private:
   typedef std::vector<ContentSettingImageView*> ContentSettingViews;
 
   friend class PageActionImageView;
   friend class PageActionWithBadgeView;
   typedef std::vector<ExtensionAction*> PageActions;
   typedef std::vector<PageActionWithBadgeView*> PageActionViews;
 
-  // Returns the number of pixels of built-in padding to the left and right for
-  // child views. This is nonzero when touch UI is enabled so as to space out
-  // child views for easier targeting. See InitTouchableLocationBarChildView().
-  static int GetBuiltInHorizontalPaddingForChildViews();
-
   // Returns the thickness of any visible left and right edge, in pixels.
   int GetHorizontalEdgeThickness() const;
 
   // The same, but for the top and bottom edges.
   int vertical_edge_thickness() const {
     return is_popup_mode_ ? kPopupEdgeThickness : kNormalEdgeThickness;
   }
 
   // Updates the visibility state of the Content Blocked icons to reflect what
   // is actually blocked on the current page. Returns true if the visibility
@@ skipping 220 matching lines @@
   // Used to register for notifications received by NotificationObserver.
   content::NotificationRegistrar registrar_;
 
   // Used to bind callback functions to this object.
   base::WeakPtrFactory<LocationBarView> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_