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

views/controls/label.cc

Index: views/controls/label.cc
===================================================================
--- views/controls/label.cc	(revision 71854)
+++ views/controls/label.cc	(working copy)
@@ -8,7 +8,6 @@
 #include <limits>
 
 #include "app/resource_bundle.h"
-#include "app/text_elider.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/string_split.h"
@@ -18,6 +17,7 @@
 #include "gfx/color_utils.h"
 #include "gfx/font.h"
 #include "gfx/insets.h"
+#include "ui/base/text/text_elider.h"
 #include "views/background.h"
 
 namespace views {
@@ -428,7 +428,7 @@
     // TODO(jungshik) : Figure out how to get 'intl.accept_languages'
     // preference and use it when calling ElideUrl.
     *paint_text = UTF16ToWideHack(
-        gfx::ElideUrl(url_, font_, GetAvailableRect().width(), std::wstring()));
+        ui::ElideUrl(url_, font_, GetAvailableRect().width(), std::wstring()));
 
     // An URLs is always treated as an LTR text and therefore we should
     // explicitly mark it as such if the locale is RTL so that URLs containing
@@ -442,7 +442,7 @@
     *paint_text = UTF16ToWide(base::i18n::GetDisplayStringInLTRDirectionality(
         WideToUTF16(*paint_text)));
   } else if (elide_in_middle_) {
-    *paint_text = UTF16ToWideHack(gfx::ElideText(text_,
+    *paint_text = UTF16ToWideHack(ui::ElideText(text_,
         font_, GetAvailableRect().width(), true));
   } else {
     *paint_text = UTF16ToWideHack(text_);