| Index: chrome/browser/ui/views/location_bar/content_setting_image_view.h
|
| diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.h b/chrome/browser/ui/views/location_bar/content_setting_image_view.h
|
| index b9144cc934985aeada590e9bff9dffd0ccfb09f8..ebf78a6bb81ae4750f28aadc38edff788cb4c9ce 100644
|
| --- a/chrome/browser/ui/views/location_bar/content_setting_image_view.h
|
| +++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.h
|
| @@ -9,6 +9,7 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/string16.h"
|
| +#include "chrome/browser/ui/views/location_bar/touchable_location_bar_view.h"
|
| #include "chrome/common/content_settings_types.h"
|
| #include "ui/base/animation/animation_delegate.h"
|
| #include "ui/views/controls/image_view.h"
|
| @@ -32,9 +33,11 @@ class SlideAnimation;
|
|
|
| class ContentSettingsDelegateView;
|
|
|
| -class ContentSettingImageView : public views::ImageView,
|
| - public ui::AnimationDelegate,
|
| - public views::Widget::Observer {
|
| +class ContentSettingImageView
|
| + : public views::ImageView,
|
| + public ui::AnimationDelegate,
|
| + public views::Widget::Observer,
|
| + public TouchableLocationBarView {
|
| public:
|
| ContentSettingImageView(ContentSettingsType content_type,
|
| LocationBarView* parent);
|
| @@ -55,6 +58,9 @@ class ContentSettingImageView : public views::ImageView,
|
| // views::Widget::Observer override:
|
| virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE;
|
|
|
| + // TouchableLocationBarView.
|
| + virtual int GetBuiltInHorizontalPadding() const OVERRIDE;
|
| +
|
| private:
|
| // views::ImageView overrides:
|
| virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
|
|
|