Move a bunch of random other files to src/ui/base...

chrome/browser/autocomplete/autocomplete_popup_view_mac.mm

 // Copyright (c) 2010 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.
 
 #include <cmath>
 
 #include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h"
 
 #include "app/resource_bundle.h"
-#include "app/text_elider.h"
 #include "base/stl_util-inl.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view_mac.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/instant/instant_confirm_dialog.h"
 #include "chrome/browser/instant/promo_counter.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/cocoa/event_utils.h"
 #include "chrome/browser/ui/cocoa/image_utils.h"
 #import "chrome/browser/ui/cocoa/location_bar/instant_opt_in_controller.h"
 #import "chrome/browser/ui/cocoa/location_bar/instant_opt_in_view.h"
 #import "chrome/browser/ui/cocoa/location_bar/omnibox_popup_view.h"
 #include "gfx/rect.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
 #import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h"
+#include "ui/base/text/text_elider.h"
 
 namespace {
 
 // The size delta between the font used for the edit and the result
 // rows.
 const int kEditFontAdjust = -1;
 
 // How much to adjust the cell sizing up from the default determined
 // by the font.
 const int kCellHeightAdjust = 6.0;
@@ skipping 115 matching lines @@
     NSMutableAttributedString* aString,
     const std::wstring originalString,
     const gfx::Font& font,
     const float width) {
   // If it already fits, nothing to be done.
   if ([aString size].width <= width) {
     return aString;
   }
 
   // If ElideText() decides to do nothing, nothing to be done.
-  const std::wstring elided(UTF16ToWideHack(ElideText(
+  const std::wstring elided(UTF16ToWideHack(ui::ElideText(
       WideToUTF16Hack(originalString), font, width, false)));
   if (0 == elided.compare(originalString)) {
     return aString;
   }
 
   // If everything was elided away, clear the string.
   if (elided.size() == 0) {
     [aString deleteCharactersInRange:NSMakeRange(0, [aString length])];
     return aString;
   }
@@ skipping 25 matching lines @@
 
   // 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 textWidth = cellWidth - kTextXOffset;
-    as = ElideString(as, match.contents, font,
-                     textWidth * kMaxContentsFraction);
+    as = ui::ElideString(as, match.contents, font,
+                         textWidth * kMaxContentsFraction);
 
     NSDictionary* attributes =
         [NSDictionary dictionaryWithObjectsAndKeys:
              font.GetNativeFont(), NSFontAttributeName,
              ContentTextColor(), NSForegroundColorAttributeName,
              nil];
     NSString* rawEnDash = [NSString stringWithFormat:@" %C ", 0x2013];
     NSAttributedString* enDash =
         [[[NSAttributedString alloc] initWithString:rawEnDash
                                          attributes:attributes] autorelease];
@@ skipping 603 matching lines @@
                        bottomRightCornerRadius:kPopupRoundingRadius];
 
   // Draw the matrix clipped to our border.
   [NSGraphicsContext saveGraphicsState];
   [path addClip];
   [super drawRect:rect];
   [NSGraphicsContext restoreGraphicsState];
 }
 
 @end