| 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 a9d89b299df9b2468e812352d693dfee166e9f6d..2a8bfc9301304a7ea68865ed1eb8b0508fd025df 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
|
| @@ -46,8 +46,6 @@ ContentSettingImageView::ContentSettingImageView(
|
| ContentSettingImageModel::CreateContentSettingImageModel(
|
| content_type)),
|
| bubble_widget_(NULL) {
|
| - SetHorizontalAlignment(ImageView::LEADING);
|
| - TouchableLocationBarView::Init(this);
|
| }
|
|
|
| ContentSettingImageView::~ContentSettingImageView() {
|
| @@ -95,7 +93,7 @@ void ContentSettingImageView::Update(TabContents* tab_contents) {
|
| }
|
|
|
| int ContentSettingImageView::GetTextAnimationSize(double state,
|
| - int text_size) {
|
| + int text_size) {
|
| if (state >= 1.0) {
|
| // Animaton is over, clear the variables.
|
| return 0;
|
|
|