Move text_elider to gfx.

chrome/browser/ui/autofill/autofill_popup_controller_impl.cc

 // 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.
 
 #include "chrome/browser/ui/autofill/autofill_popup_controller_impl.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_popup_view.h"
 #include "components/autofill/core/browser/autofill_popup_delegate.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "grit/webkit_resources.h"
 #include "third_party/WebKit/public/web/WebAutofillClient.h"
 #include "ui/base/events/event.h"
-#include "ui/base/text/text_elider.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/screen.h"
+#include "ui/gfx/text_elider.h"
 #include "ui/gfx/vector2d.h"
 
 using base::WeakPtr;
 using WebKit::WebAutofillClient;
 
 namespace autofill {
 namespace {
 
 // Used to indicate that no line is currently selected by the user.
 const int kNoSelection = -1;
@@ skipping 104 matching lines @@
 
     // The line can have no strings if it represents a UI element, such as
     // a separator line.
     if (total_text_length == 0)
       continue;
 
     int available_width = popup_width - RowWidthWithoutText(i);
 
     // Each field recieves space in proportion to its length.
     int name_size = available_width * name_width / total_text_length;
-    names_[i] = ui::ElideText(names_[i],
+    names_[i] = gfx::ElideText(names_[i],
                               GetNameFontForRow(i),
                               name_size,
-                              ui::ELIDE_AT_END);
+                              gfx::ELIDE_AT_END);
 
     int subtext_size = available_width * subtext_width / total_text_length;
-    subtexts_[i] = ui::ElideText(subtexts_[i],
+    subtexts_[i] = gfx::ElideText(subtexts_[i],
                                  subtext_font(),
                                  subtext_size,
-                                 ui::ELIDE_AT_END);
+                                 gfx::ELIDE_AT_END);
   }
 #endif
 
   if (!view_) {
     view_ = AutofillPopupView::Create(this);
 
     // It is possible to fail to create the popup, in this case
     // treat the popup as hiding right away.
     if (!view_) {
       Hide();
@@ skipping 567 matching lines @@
     // The popup can appear below the field.
     return std::make_pair(bottom_growth_start, popup_required_height);
   } else {
     // The popup must appear above the field.
     return std::make_pair(top_growth_end - popup_required_height,
                           popup_required_height);
   }
 }
 
 }  // namespace autofill