Adjust position of separator in location bar.

chrome/browser/ui/views/location_bar/icon_label_bubble_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/icon_label_bubble_view.h"
 
 #include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/views/location_bar/background_with_1_px_border.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "ui/accessibility/ax_node_data.h"
@@ skipping 99 matching lines @@
     else
       bubble_trailing_padding -= space_shortage;
   }
   image_->SetBounds(0, 0, image_width, height());
 
   // Compute the label bounds.  The label gets whatever size is left over after
   // accounting for the preferred image width and padding amounts.  Note that if
   // the label has zero size it doesn't actually matter what we compute its X
   // value to be, since it won't be visible.
   const int label_x = image_->bounds().right() + GetInternalSpacing();
-  const int label_width = std::max(
-      0, width() - label_x - bubble_trailing_padding - kSpaceBesideSeparator);
+  const int label_width =
+      std::max(0, width() - label_x - bubble_trailing_padding -
+                      kSpaceBesideSeparator - GetSeparatorLayoutWidth());
   label_->SetBounds(label_x, 0, label_width, height());
 }
 
 void IconLabelBubbleView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   label_->GetAccessibleNodeData(node_data);
 }
 
 void IconLabelBubbleView::OnNativeThemeChanged(
     const ui::NativeTheme* native_theme) {
   label_->SetEnabledColor(GetTextColor());
@@ skipping 29 matching lines @@
 }
 
 gfx::Size IconLabelBubbleView::GetSizeForLabelWidth(int label_width) const {
   gfx::Size size(image_->GetPreferredSize());
   const bool shrinking = IsShrinking();
   // Animation continues for the last few pixels even after the label is not
   // visible in order to slide the icon into its final position. Therefore it
   // is necessary to animate |total_width| even when the background is hidden
   // as long as the animation is still shrinking.
   if (ShouldShowLabel() || shrinking) {
-    // On scale factors < 2, we reserve 1 DIP for the 1 px separator.  For
-    // higher scale factors, we simply take the separator px out of the
-    // kSpaceBesideSeparator region before the separator, as that results in a
-    // width closer to the desired gap than if we added a whole DIP for the
-    // separator px.  (For scale 2, the two methods have equal error: 1 px.)
-    const int separator_width = (GetScaleFactor() >= 2) ? 0 : 1;
     const int post_label_width =
-        (kSpaceBesideSeparator + separator_width + GetPostSeparatorPadding());
+        (kSpaceBesideSeparator + GetSeparatorLayoutWidth() +
+         GetPostSeparatorPadding());
 
     // |multiplier| grows from zero to one, stays equal to one and then shrinks
     // to zero again. The view width should correspondingly grow from zero to
     // fully showing both label and icon, stay there, then shrink to just large
     // enough to show the icon. We don't want to shrink all the way back to
     // zero, since this would mean the view would completely disappear and then
     // pop back to an icon after the animation finishes.
     const int max_width =
         size.width() + GetInternalSpacing() + label_width + post_label_width;
     const int current_width = WidthMultiplier() * max_width;
     size.set_width(shrinking ? std::max(current_width, size.width())
                              : current_width);
   }
   return size;
 }
 
 int IconLabelBubbleView::GetInternalSpacing() const {
   return image_->GetPreferredSize().IsEmpty()
              ? 0
              : GetLayoutConstant(LOCATION_BAR_ELEMENT_PADDING);
 }
 
+int IconLabelBubbleView::GetSeparatorLayoutWidth() const {
+  // On scale factors < 2, we reserve 1 DIP for the 1 px separator.  For
+  // higher scale factors, we simply take the separator px out of the
+  // kSpaceBesideSeparator region before the separator, as that results in a
+  // width closer to the desired gap than if we added a whole DIP for the
+  // separator px.  (For scale 2, the two methods have equal error: 1 px.)
+  return (GetScaleFactor() >= 2) ? 0 : 1;
+}
+
 int IconLabelBubbleView::GetPostSeparatorPadding() const {
   // The location bar will add LOCATION_BAR_ELEMENT_PADDING after us.
   return kSpaceBesideSeparator -
          GetLayoutConstant(LOCATION_BAR_ELEMENT_PADDING) -
          next_element_interior_padding_;
 }
 
 float IconLabelBubbleView::GetScaleFactor() const {
   const views::Widget* widget = GetWidget();
   // There may be no widget in tests, and in ash there may be no compositor if
@@ skipping 15 matching lines @@
   const SkColor separator_color = SkColorSetA(
       plain_text_color, color_utils::IsDark(plain_text_color) ? 0x59 : 0xCC);
 
   gfx::Rect bounds(label_->bounds());
   const int kSeparatorHeight = 16;
   bounds.Inset(0, (bounds.height() - kSeparatorHeight) / 2);
   bounds.set_width(bounds.width() + kSpaceBesideSeparator);
   canvas->Draw1pxLine(gfx::PointF(bounds.top_right()),
                       gfx::PointF(bounds.bottom_right()), separator_color);
 }