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 22 matching lines @@
 
 // The fraction of the animation we'll spend animating the string into view, and
 // then again animating it closed -  total animation (slide out, show, then
 // slide in) is 1.0.
 const double kAnimatingFraction = kOpenTimeMs * 1.0 / kMoveTimeMs;
 }
 
 ContentSettingImageView::ContentSettingImageView(
     ContentSettingsType content_type,
     const int background_images[],
-    LocationBarView* parent)
-    : LocationBarDecorationView(parent, background_images),
+    LocationBarView* parent,
+    const gfx::Font& font,
+    SkColor font_color)
+    : LocationBarDecorationView(parent, background_images, font, font_color),
       content_setting_image_model_(
           ContentSettingImageModel::CreateContentSettingImageModel(
               content_type)),
       bubble_widget_(NULL) {
-  SetHorizontalAlignment(ImageView::LEADING);
-  TouchableLocationBarView::Init(this);
 }
 
 ContentSettingImageView::~ContentSettingImageView() {
   if (bubble_widget_) {
     bubble_widget_->RemoveObserver(this);
     bubble_widget_ = NULL;
   }
 }
 
 void ContentSettingImageView::Update(TabContents* tab_contents) {
@@ skipping 27 matching lines @@
       content_setting_image_model_->explanatory_string_id();
   // Check if the string for animation is available.
   if (!animated_string_id)
     return;
 
   StartLabelAnimation(l10n_util::GetStringUTF16(animated_string_id),
                       kMoveTimeMs);
 }
 
 int ContentSettingImageView::GetTextAnimationSize(double state,
-                                                   int text_size) {
+                                                  int text_size) {
   if (state >= 1.0) {
     // Animaton is over, clear the variables.
     return 0;
   } else if (state < kAnimatingFraction) {
     return static_cast<int>(text_size * state / kAnimatingFraction);
   } else if (state > (1.0 - kAnimatingFraction)) {
     return static_cast<int>(text_size * (1.0 - state) / kAnimatingFraction);
   } else {
     return text_size;
   }
@@ skipping 22 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();
 }