Fix up views web intents location bar decoration.

chrome/browser/ui/views/location_bar/content_setting_image_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/location_bar/content_setting_image_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
@@ skipping 28 matching lines @@
 
 ContentSettingImageView::ContentSettingImageView(
     ContentSettingsType content_type,
     const int background_images[],
     LocationBarView* parent)
     : LocationBarDecorationView(parent, background_images),
       content_setting_image_model_(
           ContentSettingImageModel::CreateContentSettingImageModel(
               content_type)),
       bubble_widget_(NULL) {
-  SetHorizontalAlignment(ImageView::LEADING);
-  TouchableLocationBarView::Init(this);

[Peter Kasting, 2012/09/15 00:23:46]

Is killing the touch part here safe?

[Greg Billock, 2012/09/15 04:58:20]

This is in the superclass

 }
 
 ContentSettingImageView::~ContentSettingImageView() {
   if (bubble_widget_) {
     bubble_widget_->RemoveObserver(this);
     bubble_widget_ = NULL;
   }
 }
 
 void ContentSettingImageView::Update(TabContents* tab_contents) {
@@ skipping 70 matching lines @@
           tab_contents,
           profile,
           content_setting_image_model_->get_content_settings_type()),
       tab_contents->web_contents(),
       this,
       views::BubbleBorder::TOP_RIGHT);
   bubble_widget_ = parent->delegate()->CreateViewsBubble(bubble);
   bubble_widget_->AddObserver(this);
   bubble->Show();
 }