views/location_bar: Eliminate TouchableLocationBarView.

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 122 matching lines @@
 
   LocationBarView(Browser* browser,
                   Profile* profile,
                   CommandUpdater* command_updater,
                   ToolbarModel* model,
                   Delegate* delegate,
                   bool is_popup_mode);
 
   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();
 
   // 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 173 matching lines @@
 
   // Returns the height of the control without the top and bottom
   // edges(i.e.  the height of the edit control inside).  If
   // |use_preferred_size| is true this will be the preferred height,
   // otherwise it will be the current height.
   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);
+  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();
 
   // 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;
   // Amount of padding built into the standard omnibox icons.
   static const int kIconInternalPadding;
   // Space between the edge and a bubble.
   static const int kBubblePadding;
 
  protected:
   virtual void OnFocus() OVERRIDE;
 
  private:
   typedef std::vector<ContentSettingImageView*> ContentSettingViews;
 
   friend class PageActionImageView;
   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;
 
   // The same, but for the top and bottom edges.
   int vertical_edge_thickness() const {
     return is_popup_mode_ ? kPopupEdgeThickness : kNormalEdgeThickness;
   }
 
   // Update the visibility state of the Content Blocked icons to reflect what is
   // actually blocked on the current page.
@@ skipping 146 matching lines @@
   // in the right location.
   int animation_offset_;
 
   // Used to register for notifications received by NotificationObserver.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_