Location bar: make decorations accessible

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

 // Copyright 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.
 
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #import "base/mac/mac_util.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 536 matching lines @@
   if (ev_bubble_decoration_->IsVisible()) {
     return [field_ bubblePointForDecoration:ev_bubble_decoration_.get()];
   } else {
     return [field_ bubblePointForDecoration:location_icon_decoration_.get()];
   }
 }
 
 void LocationBarViewMac::OnDecorationsChanged() {
   // TODO(shess): The field-editor frame and cursor rects should not
   // change, here.
+  std::vector<LocationBarDecoration*> decorations;
+  GetDecorations(&decorations);
+  for (const auto& decoration : decorations)
+    UpdateAccessibilityViewPosition(decoration);
   [field_ updateMouseTracking];
   [field_ resetFieldEditorFrameIfNeeded];
   [field_ setNeedsDisplay:YES];
 }
 
 // TODO(shess): This function should over time grow to closely match
 // the views Layout() function.
 void LocationBarViewMac::Layout() {
   AutocompleteTextFieldCell* cell = [field_ cell];
 
@@ skipping 398 matching lines @@
 bool LocationBarViewMac::UpdateZoomDecoration(bool default_zoom_changed) {
   WebContents* web_contents = GetWebContents();
   if (!web_contents)
     return false;
 
   return zoom_decoration_->UpdateIfNecessary(
       zoom::ZoomController::FromWebContents(web_contents), default_zoom_changed,
       IsLocationBarDark());
 }
 
+void LocationBarViewMac::UpdateAccessibilityViewPosition(
+    LocationBarDecoration* decoration) {
+  if (!decoration->IsVisible())
+    return;
+  NSRect r =
+      [[field_ cell] frameForDecoration:decoration inFrame:[field_ frame]];
+  [decoration->GetAccessibilityView() setFrame:r];
+  [decoration->GetAccessibilityView() setNeedsDisplayInRect:r];
+}
+
+void LocationBarViewMac::GetDecorations(
+    std::vector<LocationBarDecoration*>* decorations) {

[Mark Mentovai, 2016/06/23 19:30:55]

Clear the vector on entry to this function and the next one. Or, since you’re a
void return type, you could just make both of these return their vectors.

[Elly Fong-Jones, 2016/06/23 20:25:58]

Done.

+  // TODO(ellyjones): content setting decorations aren't included right now, nor
+  // are page actions and the keyword hint.

[Mark Mentovai, 2016/06/23 19:30:55]

This seems like a lot to keep in sync with (something else) as decorations come
and go. Is there already a central list of these? Does anyone else ever need all
of the decorations?

[Elly Fong-Jones, 2016/06/23 20:25:58]

It doesn't seem so. Most places only need one of the decorations, but some (eg
::Layout and ::Update) use subsets of them.

+  decorations->push_back(location_icon_decoration_.get());
+  decorations->push_back(selected_keyword_decoration_.get());
+  decorations->push_back(ev_bubble_decoration_.get());
+  decorations->push_back(save_credit_card_decoration_.get());
+  decorations->push_back(star_decoration_.get());
+  decorations->push_back(translate_decoration_.get());
+  decorations->push_back(zoom_decoration_.get());
+  decorations->push_back(manage_passwords_decoration_.get());
+}
+
 void LocationBarViewMac::OnDefaultZoomLevelChanged() {
   if (UpdateZoomDecoration(/*default_zoom_changed=*/true))
     OnDecorationsChanged();
 }
+
+void LocationBarViewMac::GetDecorationAccessibilityViews(
+    std::vector<NSView*>* views) {
+  std::vector<LocationBarDecoration*> decorations;
+  GetDecorations(&decorations);
+  for (const auto& decoration : decorations)
+    views->push_back(decoration->GetAccessibilityView());
+}