OmniboxPopupViewMac refactoring Part 3 (truncation)

chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm

Index: chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm
index 76b67fbb883cff2f5490597639668b51d019c2aa..7a7809d9994ddbaf3547faae922450123e31280e 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm
@@ -23,9 +23,7 @@
 #import "ui/base/cocoa/flipped_view.h"
 #include "ui/base/cocoa/window_size_constants.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/base/text/text_elider.h"
 #include "ui/gfx/rect.h"
-#include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
 namespace {
 
@@ -36,16 +34,9 @@ const CGFloat kCellHeightAdjust = 6.0;
 // Padding between matrix and the top and bottom of the popup window.
 const CGFloat kPopupPaddingVertical = 5.0;
 
-// How far to offset the text column from the left.
-const CGFloat kTextXOffset = 28.0;
-
 // Animation duration when animating the popup window smaller.
 const NSTimeInterval kShrinkAnimationDuration = 0.1;
 
-// Maximum fraction of the popup width that can be used to display match
-// contents.
-const CGFloat kMaxContentsFraction = 0.7;
-
 // Background colors for different states of the popup elements.
 NSColor* BackgroundColor() {
   return [NSColor controlBackgroundColor];
@@ -125,7 +116,25 @@ void OmniboxPopupViewMac::UpdatePopupAppearance() {
     OmniboxPopupCell* cell = [matrix_ cellAtRow:ii column:0];
     const AutocompleteMatch& match = GetResult().match_at(ii);
     [cell setImage:ImageForMatch(match)];
-    [cell setAttributedTitle:MatchText(match, result_font, matrix_width)];
+    [cell setContentText:DecorateMatchedString(match.contents,
+                                               match.contents_class,
+                                               ContentTextColor(),
+                                               DimContentTextColor(),
+                                               result_font)];
+    if (match.description.empty()) {
+      [cell setDescriptionText:nil];
+    } else {
+      NSMutableAttributedString* description =
+          DecorateMatchedString(match.description,
+                                match.description_class,
+                                DimContentTextColor(),
+                                DimContentTextColor(),
+                                result_font);
+      NSString* rawEnDash = @" \u2013 ";
+      [description replaceCharactersInRange:NSMakeRange(0, 0)
+                                 withString:rawEnDash];

[Scott Hess - ex-Googler, 2013/06/28 01:02:48]

I almost want to have the spc en-dash spc sequence pushed down into the cell
drawing code, rather than doing this.

[sail, 2013/06/28 18:41:16]

Done.

+      [cell setDescriptionText:description];
+    }
   }
 
   // Set the cell size to fit a line of text in the cell's font.  All
@@ -177,64 +186,6 @@ void OmniboxPopupViewMac::OnMatrixRowMiddleClicked(OmniboxPopupMatrix* matrix,
   OpenURLForRow(row, NEW_BACKGROUND_TAB);
 }
 
-// Return the text to show for the match, based on the match's
-// contents and description.  Result will be in |font|, with the
-// boldfaced version used for matches.
-NSAttributedString* OmniboxPopupViewMac::MatchText(
-    const AutocompleteMatch& match,
-    gfx::Font& font,
-    float cell_width) {
-  NSMutableAttributedString *as =
-      DecorateMatchedString(match.contents,
-                            match.contents_class,
-                            ContentTextColor(),
-                            DimContentTextColor(),
-                            font);
-
-  // If there is a description, append it, separated from the contents
-  // with an en dash, and decorated with a distinct color.
-  if (!match.description.empty()) {
-    // Make sure the current string fits w/in kMaxContentsFraction of
-    // the cell to make sure the description will be at least
-    // partially visible.
-    // TODO(shess): Consider revising our NSCell subclass to have two
-    // bits and just draw them right, rather than truncating here.
-    const float text_width = cell_width - kTextXOffset;
-    as = ElideString(as, match.contents, font,
-                     text_width * kMaxContentsFraction);
-
-    NSDictionary* attributes = @{
-        NSFontAttributeName :  font.GetNativeFont(),
-        NSForegroundColorAttributeName : ContentTextColor()
-    };
-    NSString* raw_en_dash = @" \u2013 ";
-    NSAttributedString* en_dash =
-        [[[NSAttributedString alloc] initWithString:raw_en_dash
-                                         attributes:attributes] autorelease];
-
-    // In Windows, a boolean force_dim is passed as true for the
-    // description.  Here, we pass the dim text color for both normal and dim,
-    // to accomplish the same thing.
-    NSAttributedString* description =
-        DecorateMatchedString(match.description, match.description_class,
-                              DimContentTextColor(),
-                              DimContentTextColor(),
-                              font);
-
-    [as appendAttributedString:en_dash];
-    [as appendAttributedString:description];
-  }
-
-  NSMutableParagraphStyle* style =
-      [[[NSMutableParagraphStyle alloc] init] autorelease];
-  [style setLineBreakMode:NSLineBreakByTruncatingTail];
-  [style setTighteningFactorForTruncation:0.0];
-  [as addAttribute:NSParagraphStyleAttributeName value:style
-             range:NSMakeRange(0, [as length])];
-
-  return as;
-}
-
 // static
 NSMutableAttributedString* OmniboxPopupViewMac::DecorateMatchedString(
     const string16& match_string,
@@ -300,42 +251,6 @@ NSMutableAttributedString* OmniboxPopupViewMac::DecorateMatchedString(
   return as;
 }
 
-NSMutableAttributedString* OmniboxPopupViewMac::ElideString(
-    NSMutableAttributedString* a_string,
-    const string16& original_string,
-    const gfx::Font& font,
-    const float width) {
-  // If it already fits, nothing to be done.
-  if ([a_string size].width <= width) {
-    return a_string;
-  }
-
-  // If ElideText() decides to do nothing, nothing to be done.
-  const string16 elided =
-      ui::ElideText(original_string, font, width, ui::ELIDE_AT_END);
-  if (0 == elided.compare(original_string)) {
-    return a_string;
-  }
-
-  // If everything was elided away, clear the string.
-  if (elided.empty()) {
-    [a_string deleteCharactersInRange:NSMakeRange(0, [a_string length])];
-    return a_string;
-  }
-
-  // The ellipses should be the last character, and everything before
-  // that should match the original string.
-  const size_t i(elided.length() - 1);
-  DCHECK_NE(0, elided.compare(0, i, original_string));
-
-  // Replace the end of |aString| with the ellipses from |elided|.
-  NSString* s = base::SysUTF16ToNSString(elided.substr(i));
-  [a_string replaceCharactersInRange:NSMakeRange(i, [a_string length] - i)
-                          withString:s];
-
-  return a_string;
-}
-
 const AutocompleteResult& OmniboxPopupViewMac::GetResult() const {
   return model_->result();
 }