Index: chrome/browser/ui/views/location_bar/location_icon_view.h |
diff --git a/chrome/browser/ui/views/location_bar/location_icon_view.h b/chrome/browser/ui/views/location_bar/location_icon_view.h |
index ba12c5f3e520b84ebdcfed1d21eb1aa8378b6a12..2d6ad0c5b4bb9f19e80c15fe2da5caca11526ea7 100644 |
--- a/chrome/browser/ui/views/location_bar/location_icon_view.h |
+++ b/chrome/browser/ui/views/location_bar/location_icon_view.h |
@@ -6,7 +6,6 @@ |
#define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_ICON_VIEW_H_ |
#include "chrome/browser/ui/views/location_bar/page_info_helper.h" |
-#include "chrome/browser/ui/views/location_bar/touchable_location_bar_view.h" |
#include "ui/views/controls/image_view.h" |
class LocationBarView; |
@@ -14,22 +13,18 @@ class LocationBarView; |
// LocationIconView is used to display an icon to the left of the edit field. |
// This shows the user's current action while editing, the page security |
// status on https pages, or a globe for other URLs. |
-class LocationIconView : public views::ImageView, |
- public TouchableLocationBarView { |
+class LocationIconView : public views::ImageView { |
public: |
explicit LocationIconView(LocationBarView* location_bar); |
virtual ~LocationIconView(); |
- // Overridden from views::ImageView: |
+ // views::ImageView: |
virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; |
virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; |
- // Overridden from ui::EventHandler: |
+ // ui::EventHandler: |
virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; |
- // TouchableLocationBarView. |
- virtual int GetBuiltInHorizontalPadding() const OVERRIDE; |
- |
// Whether we should show the tooltip for this icon or not. |
void ShowTooltip(bool show); |