OmniboxPopupViewMac refactoring Part 3 (truncation)

chrome/browser/ui/cocoa/omnibox/omnibox_popup_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_POPUP_VIEW_MAC_H_
 #define CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_POPUP_VIEW_MAC_H_
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/basictypes.h"
@@ skipping 32 matching lines @@
   // Overridden from OmniboxPopupMatrixDelegate:
   virtual void OnMatrixRowSelected(OmniboxPopupMatrix* matrix,
                                    size_t row) OVERRIDE;
   virtual void OnMatrixRowClicked(OmniboxPopupMatrix* matrix,
                                   size_t row) OVERRIDE;
   virtual void OnMatrixRowMiddleClicked(OmniboxPopupMatrix* matrix,
                                         size_t row) OVERRIDE;
 
   OmniboxPopupMatrix* matrix() { return matrix_; }
 
-  // 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.
-  static NSAttributedString* MatchText(const AutocompleteMatch& match,
-                                       gfx::Font& font,
-                                       float cell_width);
-
   // Applies the given font and colors to the match string based on
   // classifications.
   static NSMutableAttributedString* DecorateMatchedString(
       const string16& match_string,
       const AutocompleteMatch::ACMatchClassifications& classifications,
       NSColor* text_color,
       NSColor* dim_text_color,
       gfx::Font& font);
 
-  // Helper for MatchText() to elide a marked-up string using
-  // gfx::ElideText() as a model.  Modifies |a_string| 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* a_string,
-      const string16& original_string,
-      const gfx::Font& font,
-      const float cell_width);
-
  protected:
   // Gets the autocomplete results. This is virtual so that it can be overriden
   // by tests.
   virtual const AutocompleteResult& GetResult() const;
 
  private:
   // Create the popup_ instance if needed.
   void CreatePopupIfNeeded();
 
   // Calculate the appropriate position for the popup based on the
@@ skipping 20 matching lines @@
 
   base::scoped_nsobject<OmniboxPopupMatrix> matrix_;
   base::scoped_nsobject<NSView> top_separator_view_;
   base::scoped_nsobject<NSView> bottom_separator_view_;
   base::scoped_nsobject<NSBox> background_view_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxPopupViewMac);
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_POPUP_VIEW_MAC_H_