Anchor the infobar arrow to the LocationIconView correctly.

chrome/browser/ui/views/location_bar/location_bar_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/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/i18n/rtl.h"
@@ skipping 427 matching lines @@
 void LocationBarView::SetShowFocusRect(bool show) {
   show_focus_rect_ = show;
   SchedulePaint();
 }
 
 void LocationBarView::SelectAll() {
   omnibox_view_->SelectAll(true);
 }
 
 gfx::Point LocationBarView::GetLocationBarAnchorPoint() const {
+  const views::ImageView* image = location_icon_view_->GetImageView();
   // The +1 in the next line creates a 1-px gap between icon and arrow tip.
-  const int icon_padding = GetLayoutConstant(ICON_LABEL_VIEW_TRAILING_PADDING);
-  gfx::Point icon_bottom(
-      0, location_icon_view_->GetImageBounds().bottom() - icon_padding + 1);
-  gfx::Point icon_center(location_icon_view_->GetImageBounds().CenterPoint());
-  gfx::Point point(icon_center.x(), icon_bottom.y());
-  ConvertPointToTarget(location_icon_view_, this, &point);
+  int icon_bottom = image->GetImageBounds().bottom() -
+                    GetLayoutConstant(ICON_LABEL_VIEW_TRAILING_PADDING) + 1;
+  gfx::Point icon_center(image->GetImageBounds().CenterPoint());
+  gfx::Point point(icon_center.x(), icon_bottom);
+  ConvertPointToTarget(image, this, &point);
   return point;
 }
 
 int LocationBarView::GetInternalHeight(bool use_preferred_size) {
   int total_height =
       use_preferred_size ? GetPreferredSize().height() : height();
   return std::max(total_height - (VerticalPadding() * 2), 0);
 }
 
 void LocationBarView::GetOmniboxPopupPositioningInfo(
@@ skipping 881 matching lines @@
 
 void LocationBarView::AnimationEnded(const gfx::Animation* animation) {
   AnimationProgressed(animation);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarView, private OmniboxEditController implementation:
 
 void LocationBarView::OnChanged() {
   RefreshLocationIcon();
-  location_icon_view_->ShowTooltip(!GetOmniboxView()->IsEditingOrEmpty());
+  location_icon_view_->set_show_tooltip(!GetOmniboxView()->IsEditingOrEmpty());
   Layout();
   SchedulePaint();
 }
 
 void LocationBarView::OnSetFocus() {
   GetFocusManager()->SetFocusedView(this);
 }
 
 const ToolbarModel* LocationBarView::GetToolbarModel() const {
   return delegate_->GetToolbarModel();
@@ skipping 10 matching lines @@
 // LocationBarView, private TemplateURLServiceObserver implementation:
 
 void LocationBarView::OnTemplateURLServiceChanged() {
   template_url_service_->RemoveObserver(this);
   template_url_service_ = nullptr;
   // If the browser is no longer active, let's not show the info bubble, as this
   // would make the browser the active window again.
   if (omnibox_view_ && omnibox_view_->GetWidget()->IsActive())
     ShowFirstRunBubble();
 }