Fix position of permission bubbles anchored off the padlock.

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 57 matching lines @@
 #include "components/zoom/zoom_controller.h"
 #include "components/zoom/zoom_event_manager.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/feature_switch.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/compositor/paint_recorder.h"
 #include "ui/events/event.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia_operations.h"
@@ skipping 268 matching lines @@
 
 void LocationBarView::SetShowFocusRect(bool show) {
   show_focus_rect_ = show;
   SchedulePaint();
 }
 
 void LocationBarView::SelectAll() {
   omnibox_view_->SelectAll(true);
 }
 
-gfx::Point LocationBarView::GetLocationBarAnchorPoint() const {
+gfx::Point LocationBarView::GetInfoBarAnchorPoint() const {
   const views::ImageView* image = location_icon_view_->GetImageView();
   const gfx::Rect image_bounds(image->GetImageBounds());
   gfx::Point point(image_bounds.CenterPoint().x(), image_bounds.bottom());
   ConvertPointToTarget(image, this, &point);
   return point;
 }
 
+views::View* LocationBarView::GetSecurityBubbleAnchorView() {
+  if (ui::MaterialDesignController::IsSecondaryUiMaterial())

[Peter Kasting, 2017/02/13 21:36:31]

Nit: Should we be using LayoutDelegate::Get()->IsHarmonyMode()?

I feel like we should standardize on one or the other, I'm not sure if we have a
pattern to follow.  Since this is views code, using the views LayoutDelegate
seems correct.  OTOH, I was trying to kill that function.  So I don't know what
to do.

[tapted, 2017/02/14 04:00:27]

hrm. I could go either way really, but I'm leaning towards
ui::MaterialDesignController -- it's verbose, but can be used in more places
(e.g. if we _had_ to pick one - that would be it [unless we move
LayoutDelegate..]). And there is ui/views code in BubbleBorder that influences
positioning that is already using ui::MaterialDesignController (or anon::UseMd()
for brevity), so using the same thing here on the lead up to that positioning
logic gives better consistency guarantees.

+    return this;
+  return location_icon_view()->GetImageView();

[Peter Kasting, 2017/02/13 21:36:31]

Nit: Fractionally simpler:

  return ui::MaterialDesignController::IsSecondaryUiMaterial()
             ? this
             : location_icon_view()->GetImageView();

[tapted, 2017/02/14 04:00:27]

Done.

[tapted, 2017/02/14 04:27:08]

Un-Done :) - compiler wouldn't let me do this -- the types either side of the
`:` need to be the same (i.e. even though they both inherit from View*, the
compiler doesn't know at that point that they will be upcast to View* and
refuses to pick one of LocationBarView* or ImageView* arbitrarily to give type
to the expression).

Went back to `if` rather than introducing a local var or static_cast<>ing

[Peter Kasting, 2017/02/14 04:30:00]

I probably would have "static_cast<views::View*>(this)" the first arm, which
should have made the second arm work without a cast, but if you're more
comfortable with a conditional, that's OK too.

+}
+
 void LocationBarView::GetOmniboxPopupPositioningInfo(
     gfx::Point* top_left_screen_coord,
     int* popup_width,
     int* left_margin,
     int* right_margin,
     int top_edge_overlap) {
   *top_left_screen_coord = gfx::Point(0, parent()->height() - top_edge_overlap);
   views::View::ConvertPointToScreen(parent(), top_left_screen_coord);
 
   *popup_width = parent()->width();
@@ skipping 804 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();
 }