Fix assets related to ev bubble and tab to search UI elements.

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 14 matching lines @@
 using content::WebContents;
 
 namespace {
 // Animation parameters.
 const int kOpenTimeMs = 150;
 const int kFullOpenedTimeMs = 3200;
 const int kMoveTimeMs = kFullOpenedTimeMs + 2 * kOpenTimeMs;
 const int kFrameRateHz = 60;
 // Margins for animated box.
 const int kTextMarginPixels = 4;
-const int kIconLeftMargin = 4;
+const int kIconLeftMargin = 2;
 
 
 // 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,
@@ skipping 58 matching lines @@
     slide_animator_->SetTweenType(ui::Tween::LINEAR);
   }
   // Do not start animation if already in progress.
   if (!slide_animator_->is_animating()) {
     // Initialize animated string. It will be cleared when animation is
     // completed.
     animated_text_ = l10n_util::GetStringUTF16(animated_string_id);
     text_size_ = ui::ResourceBundle::GetSharedInstance().GetFont(
         ui::ResourceBundle::MediumFont).GetStringWidth(animated_text_);
     text_size_ += 2 * kTextMarginPixels + kIconLeftMargin;
-    if (border())
-      border()->GetInsets(&saved_insets_);
     slide_animator_->Show();
   }
 }
 
 gfx::Size ContentSettingImageView::GetPreferredSize() {
   gfx::Size preferred_size(views::ImageView::GetPreferredSize());
   preferred_size.set_height(std::max(preferred_size.height(),
                                      background_painter_.height()));
   // When view is animated visible_text_size_ > 0, it is 0 otherwise.
   preferred_size.set_width(preferred_size.width() + visible_text_size_);
@@ skipping 89 matching lines @@
   // is changing in size during the animation, giving the appearance of the text
   // sliding out and then back in. When the text completely slid out the yellow
   // border is no longer painted around the icon. |visible_text_size_| is 0 when
   // animation is stopped.
   if (slide_animator_.get() &&
       (slide_animator_->is_animating() || pause_animation_)) {
     // In the non-animated state borders' left() is 0, in the animated state it
     // is the kIconLeftMargin, so we need to animate border reduction when it
     // starts to disappear.
     int necessary_left_margin = std::min(kIconLeftMargin, visible_text_size_);
-    views::Border* empty_border = views::Border::CreateEmptyBorder(
-        saved_insets_.top(),
-        saved_insets_.left() + necessary_left_margin,
-        saved_insets_.bottom(),
-        saved_insets_.right());
+    views::Border* empty_border =
+        views::Border::CreateEmptyBorder(0, necessary_left_margin, 0, 0);
     set_border(empty_border);
     views::ImageView::OnPaint(canvas);
 
     // Paint text to the right of the icon.
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     canvas->DrawStringInt(animated_text_,
         rb.GetFont(ui::ResourceBundle::MediumFont), SK_ColorBLACK,
-        GetImageBounds().right() + kTextMarginPixels, y(),
+        GetImageBounds().right() + kTextMarginPixels, 0,
         width() - GetImageBounds().width(), height(),
         gfx::Canvas::TEXT_ALIGN_LEFT | gfx::Canvas::TEXT_VALIGN_MIDDLE);
   } else {
     views::ImageView::OnPaint(canvas);
   }
 }
 
 void ContentSettingImageView::OnPaintBackground(gfx::Canvas* canvas) {
   if (slide_animator_.get() &&
       (slide_animator_->is_animating() || pause_animation_))
@@ skipping 11 matching lines @@
     slide_animator_->Reset(
         1.0 - (visible_text_size_ * kAnimatingFraction) / text_size_);
     pause_animation_ = false;
     slide_animator_->Show();
   }
 }
 
 int ContentSettingImageView::GetBuiltInHorizontalPadding() const {
   return GetBuiltInHorizontalPaddingImpl();
 }