[Mac] Fix Omnibox decoration accessibility views in RTL

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"
 #import "base/mac/mac_util.h"
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/app/chrome_command_ids.h"
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/translate/translate_service.h"
 #include "chrome/browser/ui/autofill/save_card_bubble_controller_impl.h"
 #include "chrome/browser/ui/browser_list.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h"
 #import "chrome/browser/ui/cocoa/first_run_bubble_controller.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
+#import "chrome/browser/ui/cocoa/l10n_util.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h"
 #import "chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/save_credit_card_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/security_state_bubble_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/star_decoration.h"
@@ skipping 695 matching lines @@
 bool LocationBarViewMac::IsSecureConnection(
     security_state::SecurityLevel level) const {
   return level == security_state::SECURE ||
          level == security_state::EV_SECURE;
 }
 
 void LocationBarViewMac::UpdateAccessibilityView(
     LocationBarDecoration* decoration) {
   if (!decoration->IsVisible())
     return;
+  // This uses |frame| instead of |bounds| because the accessibility views are
+  // parented to the toolbar.
   NSRect apparent_frame =
       [[field_ cell] frameForDecoration:decoration inFrame:[field_ frame]];
 
   // This is a bit subtle:
   // The decorations' accessibility views can become key to allow keyboard
   // access to the location bar decorations, but Cocoa's automatic key view loop
   // sorts by top-left coordinate. Since the omnibox's top-left coordinate is
   // before its leading decorations, the omnibox would sort before its own
   // leading decorations, which was logical but visually unintuitive. Therefore,
   // for leading decorations, this method moves their frame to be "just before"
   // the omnibox in automatic key view loop order, and gives them an apparent
   // frame (see DecorationAccessibilityView) so that they still paint their
   // focus rings at the right place.
   //
   // TODO(lgrey): This hack doesn't work in RTL layouts, but the layout of the
   // omnibox is currently screwed up in RTL layouts anyway. See
   // https://crbug.com/715627.
   NSRect real_frame = apparent_frame;
   int left_index = [[field_ cell] leadingDecorationIndex:decoration];
 
   // If there are ever too many leading views, the fake x-coords might land
   // before the button preceding the omnibox in the key view order. This
   // threshold is just a guess.
   DCHECK_LT(left_index, 10);
-  if (left_index != -1)
-    real_frame.origin.x = [field_ frame].origin.x - left_index - 1;
-
+  if (left_index != -1) {
+    CGFloat delta = left_index + 1;
+    real_frame.origin.x =
+        cocoa_l10n_util::ShouldDoExperimentalRTLLayout()
+            ? NSMaxX([field_ frame]) + delta - NSWidth(real_frame)
+            : NSMinX([field_ frame]) - delta;
+  }
   decoration->UpdateAccessibilityView(apparent_frame);
   [decoration->GetAccessibilityView() setFrame:real_frame];
   [decoration->GetAccessibilityView() setNeedsDisplayInRect:apparent_frame];
 }
 
 std::vector<LocationBarDecoration*> LocationBarViewMac::GetDecorations() {
   std::vector<LocationBarDecoration*> decorations;
   // TODO(ellyjones): content setting decorations aren't included right now, nor
   // are page actions and the keyword hint.
   decorations.push_back(location_icon_decoration_.get());
@@ skipping 12 matching lines @@
     OnDecorationsChanged();
 }
 
 std::vector<NSView*> LocationBarViewMac::GetDecorationAccessibilityViews() {
   std::vector<LocationBarDecoration*> decorations = GetDecorations();
   std::vector<NSView*> views;
   for (auto* decoration : decorations)
     views.push_back(decoration->GetAccessibilityView());
   return views;
 }