views/location_bar: Eliminate TouchableLocationBarView.

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

Index: chrome/browser/ui/views/location_bar/location_bar_view.h
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h
index 96151da987aec284a8c479261c1cb6365c6e1e91..4239b42a42d13b50bf8e6bd634aad2e836ae6dc5 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -140,6 +140,9 @@ class LocationBarView : public LocationBar,
 
   virtual ~LocationBarView();
 
+  // Call this from the constructor (or during early initialization).

[Peter Kasting, 2013/08/06 20:32:42]

This comment is misleading, it sounds as if it refers to LocationBarView's
constructor.  Clarify.

[tfarina, 2013/08/07 18:42:53]

Done.

+  static void InitTouchableLocationBarView(views::View* view);
+
   // Initializes the LocationBarView.
   void Init();
 
@@ -333,11 +336,10 @@ class LocationBarView : public LocationBar,
   // 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);
+  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.
@@ -362,6 +364,10 @@ class LocationBarView : public LocationBar,
   friend class PageActionWithBadgeView;
   typedef std::vector<PageActionWithBadgeView*> PageActionViews;
 
+  // Returns the number of pixels of built-in padding to the left and
+  // right of the image for this view.

[Peter Kasting, 2013/08/06 20:32:42]

Nit: Also need to update this comment.

[tfarina, 2013/08/07 18:42:53]

Done.

+  static int GetBuiltInHorizontalPaddingForChildViews();
+
   // Returns the thickness of any visible left and right edge, in pixels.
   int GetHorizontalEdgeThickness() const;