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 24 matching lines @@
 class AutofillCreditCardView;
 class CommandUpdater;
 class ContentSettingBubbleModelDelegate;
 class ContentSettingImageView;
 class EVBubbleView;
 class ExtensionAction;
 class GURL;
 class InstantController;
 class KeywordHintView;
 class LocationIconView;
-class MicSearchView;
 class OpenPDFInReaderView;
 class PageActionWithBadgeView;
 class PageActionImageView;
 class Profile;
 class ScriptBubbleIconView;
 class SelectedKeywordView;
 class StarView;
 class TemplateURLService;
 class ZoomView;
 
 namespace views {
 class BubbleDelegateView;
+class ImageButton;
 class Label;
 class Widget;
 }
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // LocationBarView class
 //
 //   The LocationBarView class is a View subclass that paints the background
 //   of the URL bar strip and contains its content.
@@ skipping 65 matching lines @@
 
   LocationBarView(Browser* browser,
                   Profile* profile,
                   CommandUpdater* command_updater,
                   ToolbarModel* model,
                   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 172 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 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;
   }
 
   // Update the visibility state of the Content Blocked icons to reflect what is
   // actually blocked on the current page.
@@ skipping 93 matching lines @@
   SelectedKeywordView* selected_keyword_view_;
 
   // View responsible for showing suggested text. This is NULL when there is no
   // suggested text.
   views::Label* suggested_text_view_;
 
   // Shown if the selected url has a corresponding keyword.
   KeywordHintView* keyword_hint_view_;
 
   // The voice search icon.
-  MicSearchView* mic_search_view_;
+  views::ImageButton* mic_search_view_;
 
   // The content setting views.
   ContentSettingViews content_setting_views_;
 
   // The zoom icon.
   ZoomView* zoom_view_;
 
   // A bubble that shows after successful submission of the Autofill dialog.
   AutofillCreditCardView* autofill_credit_card_view_;
 
@@ skipping 32 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_