| 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 1363a69790b334c99c2fd4b60f9684cc7d984d4d..4d6fdfe611df404c130f6fe418f0a514049ec9a4 100644
|
| --- a/chrome/browser/ui/views/location_bar/location_icon_view.h
|
| +++ b/chrome/browser/ui/views/location_bar/location_icon_view.h
|
| @@ -7,6 +7,7 @@
|
| #pragma once
|
|
|
| #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;
|
| @@ -17,7 +18,9 @@ class MouseEvent;
|
| // 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 {
|
| +class LocationIconView
|
| + : public views::ImageView,
|
| + public TouchableLocationBarView {
|
| public:
|
| explicit LocationIconView(LocationBarView* location_bar);
|
| virtual ~LocationIconView();
|
| @@ -28,6 +31,9 @@ class LocationIconView : public views::ImageView {
|
| virtual ui::GestureStatus OnGestureEvent(
|
| const views::GestureEvent& event) OVERRIDE;
|
|
|
| + // TouchableLocationBarView.
|
| + virtual int GetBuiltInHorizontalPadding() const OVERRIDE;
|
| +
|
| // Whether we should show the tooltip for this icon or not.
|
| void ShowTooltip(bool show);
|
|
|
|
|