[Mac] Fix some omnibox breakage for small windows.

Change the code to decorate the contents string normally, then elide
the marked-up string if it doesn't fit.

http://crbug.com/23279
TEST=See bug.

Review URL: http://codereview.chromium.org/264012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28603 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 0 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_mac.h b/chrome/browser/autocomplete/autocomplete_popup_view_mac.h
index 2dddd70..3782ef8 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_view_mac.h
+++ b/chrome/browser/autocomplete/autocomplete_popup_view_mac.h
@@ -93,6 +93,18 @@ class AutocompletePopupViewMac : public AutocompletePopupView {
       const AutocompleteMatch::ACMatchClassifications &classifications,
       NSColor* textColor, gfx::Font& font);
 
+  // Helper for MatchText() to elide a marked-up string using
+  // gfx::ElideText() as a model.  Modifies |aString| in place.
+  // TODO(shess): Consider breaking AutocompleteButtonCell out of this
+  // code, and modifying it to have something like -setMatch:, so that
+  // these convolutions to expose internals for testing can be
+  // cleaner.
+  static NSMutableAttributedString* ElideString(
+      NSMutableAttributedString* aString,
+      const std::wstring originalString,
+      const gfx::Font& font,
+      const float cellWidth);
+
  private:
   // Create the popup_ instance if needed.
   void CreatePopupIfNeeded();