[Mac] Ensure Omnibox text is always right-aligned in RTL

chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_
 #define CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_
 
 #import <Cocoa/Cocoa.h>
 #include <stddef.h>
 
@@ skipping 115 matching lines @@
   // If |resource_id| has a PDF image which can be used, return it.
   // Otherwise return the PNG image from the resource bundle.
   static NSImage* ImageForResource(int resource_id);
 
   // Color used to draw suggest text.
   static NSColor* SuggestTextColor();
 
   AutocompleteTextField* field() const { return field_; }
 
  private:
+  FRIEND_TEST_ALL_PREFIXES(OmniboxViewMacTest,

[Mark Mentovai, 2016/12/12 17:45:24]

#include "base/gtest_prod_util.h" for this macro.

[lgrey, 2016/12/12 18:13:33]

Done.

+                           WritingDirectionLTR);
+  FRIEND_TEST_ALL_PREFIXES(OmniboxViewMacTest,
+                           WritingDirectionRTL);
   // Called when the user hits backspace in |field_|.  Checks whether
   // keyword search is being terminated.  Returns true if the
   // backspace should be intercepted (not forwarded on to the standard
   // machinery).
   bool OnBackspacePressed();
 
   // Returns the field's currently selected range.  Only valid if the
   // field has focus.
   NSRange GetSelectedRange() const;
 
@@ skipping 20 matching lines @@
 
   // Update the field with |display_text| and set the selection.
   void SetTextAndSelectedRange(const base::string16& display_text,
                                const NSRange range);
 
   // Pass the current content of |field_| to SetText(), maintaining
   // any selection.  Named to be consistent with GTK and Windows,
   // though here we cannot really do the in-place operation they do.
   void EmphasizeURLComponents() override;
 
-  // Apply our font and paragraph style to |attributedString|.
-  void ApplyTextStyle(NSMutableAttributedString* attributedString);
-
   // Calculates text attributes according to |display_text| and applies them
   // to the given |attributedString| object.
   void ApplyTextAttributes(const base::string16& display_text,
                            NSMutableAttributedString* attributedString);
 
+  // Apply our font and paragraph style to |attributedString|.
+  void ApplyTextStyle(NSMutableAttributedString* attributedString);

[Mark Mentovai, 2016/12/12 17:45:24]

I don’t see why this needs to move.

[lgrey, 2016/12/12 18:13:33]

Accidentally put it back in the wrong place after adding the friend thing. Done.

+
   // Return the number of UTF-16 units in the current buffer, excluding the
   // suggested text.
   int GetOmniboxTextLength() const override;
   NSUInteger GetTextLength() const;
 
   // Returns true if the caret is at the end of the content.
   bool IsCaretAtEnd() const;
 
   // Announce that an inline autocomplete is available for screenreaders.
   void AnnounceAutocompleteForScreenReader(const base::string16& text);
@@ skipping 31 matching lines @@
   // painted. Used to measure omnibox responsiveness with a histogram.
   base::TimeTicks insert_char_time_;
 
   // The time when OnBeforeDrawRect() was called.
   base::TimeTicks draw_rect_start_time_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxViewMac);
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_