Adjust positioning of location bar icons.

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/strings/utf_string_conversions.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
+#include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/views/content_setting_bubble_contents.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/theme_provider.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/views/animation/ink_drop_impl.h"
@@ skipping 15 matching lines @@
     LocationBarView* parent,
     const gfx::FontList& font_list)
     : IconLabelBubbleView(font_list, false),
       parent_(parent),
       content_setting_image_model_(std::move(image_model)),
       slide_animator_(this),
       pause_animation_(false),
       pause_animation_state_(0.0),
       bubble_view_(nullptr),
       suppress_mouse_released_action_(false) {
+  set_next_element_interior_padding(LocationBarView::kIconInteriorPadding);
   SetInkDropMode(InkDropMode::ON);
   SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
-  image()->SetHorizontalAlignment(base::i18n::IsRTL()
-                                      ? views::ImageView::TRAILING
-                                      : views::ImageView::LEADING);
   image()->EnableCanvasFlippingForRTLUI(true);
   label()->SetElideBehavior(gfx::NO_ELIDE);
   label()->SetVisible(false);
 
   slide_animator_.SetSlideDuration(kAnimationDurationMS);
   slide_animator_.SetTweenType(gfx::Tween::LINEAR);
 }
 
 ContentSettingImageView::~ContentSettingImageView() {
   if (bubble_view_ && bubble_view_->GetWidget())
@@ skipping 95 matching lines @@
 }
 
 SkColor ContentSettingImageView::GetTextColor() const {
   return GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_TextfieldDefaultColor);
 }
 
 bool ContentSettingImageView::ShouldShowLabel() const {
   return (!IsShrinking() ||
           (width() > (image()->GetPreferredSize().width() +
-                      2 * LocationBarView::kHorizontalPadding))) &&
+                      2 * GetLayoutConstant(LOCATION_BAR_ELEMENT_PADDING)))) &&
          (slide_animator_.is_animating() || pause_animation_);
 }
 
 double ContentSettingImageView::WidthMultiplier() const {
   double state = pause_animation_ ? pause_animation_state_
                                   : slide_animator_.GetCurrentValue();
   // The fraction of the animation we'll spend animating the string into view,
   // which is also the fraction we'll spend animating it closed; total
   // animation (slide out, show, then slide in) is 1.0.
   const double kOpenFraction =
@@ skipping 98 matching lines @@
 void ContentSettingImageView::OnWidgetVisibilityChanged(views::Widget* widget,
                                                         bool visible) {
   // |widget| is a bubble that has just got shown / hidden.
   if (!visible && !label()->visible())
     AnimateInkDrop(views::InkDropState::DEACTIVATED, nullptr /* event */);
 }
 
 void ContentSettingImageView::UpdateImage() {
   SetImage(content_setting_image_model_->GetIcon(GetTextColor()).AsImageSkia());
 }