Index: chrome/browser/ui/views/location_bar/content_setting_image_view.cc |
diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc |
index 014c3dacf31e2ec523ff0593f2f72468b6d88513..42b2ff5ffbf48f691afe3f0e8110bacc92265b1b 100644 |
--- a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc |
+++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc |
@@ -83,7 +83,7 @@ ContentSettingImageView::ContentSettingImageView( |
text_label_->SetElideBehavior(views::Label::NO_ELIDE); |
AddChildView(text_label_); |
- TouchableLocationBarView::Init(this); |
+ LocationBarView::InitTouchableLocationBarView(this); |
slide_animator_.SetSlideDuration(kAnimationDurationMS); |
slide_animator_.SetTweenType(ui::Tween::LINEAR); |
@@ -94,10 +94,6 @@ ContentSettingImageView::~ContentSettingImageView() { |
bubble_widget_->RemoveObserver(this); |
} |
-int ContentSettingImageView::GetBuiltInHorizontalPadding() const { |
- return GetBuiltInHorizontalPaddingImpl(); |
-} |
- |
void ContentSettingImageView::Update(content::WebContents* web_contents) { |
// Note: We explicitly want to call this even if |web_contents| is NULL, so we |
// get hidden properly while the user is editing the omnibox. |