Adjust positioning of location bar icons.

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

 // Copyright 2013 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/bubble_icon_view.h"
 
 #include "chrome/browser/command_updater.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"
 #include "ui/events/event.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/animation/ink_drop_highlight.h"
 #include "ui/views/animation/ink_drop_impl.h"
 #include "ui/views/bubble/bubble_dialog_delegate.h"
 
@@ skipping 34 matching lines @@
   image_->GetAccessibleNodeData(node_data);
   node_data->role = ui::AX_ROLE_BUTTON;
 }
 
 bool BubbleIconView::GetTooltipText(const gfx::Point& p,
                                     base::string16* tooltip) const {
   return !IsBubbleShowing() && image_->GetTooltipText(p, tooltip);
 }
 
 gfx::Size BubbleIconView::GetPreferredSize() const {
-  return image_->GetPreferredSize();
+  gfx::Rect image_rect(image_->GetPreferredSize());
+  image_rect.Inset(-gfx::Insets(LocationBarView::kIconInteriorPadding));
+  DCHECK_EQ(image_rect.height(),
+            GetLayoutConstant(LOCATION_BAR_HEIGHT) -
+                2 * (GetLayoutConstant(LOCATION_BAR_ELEMENT_PADDING) +
+                     BackgroundWith1PxBorder::kLocationBarBorderThicknessDip));
+  return image_rect.size();
 }
 
 void BubbleIconView::Layout() {
   View::Layout();
   image_->SetBoundsRect(GetLocalBounds());
 }
 
 bool BubbleIconView::OnMousePressed(const ui::MouseEvent& event) {
   // If the bubble is showing then don't reshow it when the mouse is released.
   suppress_mouse_released_action_ = IsBubbleShowing();
@@ skipping 124 matching lines @@
   image_->SetImage(gfx::CreateVectorIcon(
       GetVectorIcon(), LocationBarView::kIconWidth, icon_color));
 }
 
 void BubbleIconView::SetActiveInternal(bool active) {
   if (active_ == active)
     return;
   active_ = active;
   UpdateIcon();
 }