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

ui/base/text/text_elider.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 <vector>
 
-#include "app/text_elider.h"
+#include "ui/base/text/text_elider.h"
+
 #include "base/file_path.h"
 #include "base/i18n/break_iterator.h"
 #include "base/i18n/char_iterator.h"
 #include "base/i18n/rtl.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/font.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 #include "net/base/net_util.h"
 #include "net/base/registry_controlled_domain.h"
 
+namespace ui {
 
 namespace {
 
 const char* kEllipsis = "\xE2\x80\xA6";
 
 // Cuts |text| to be |length| characters long.  If |cut_in_middle| is true, the
 // middle of the string is removed to leave equal-length pieces from the
 // beginning and end of the string; otherwise, the end of the string is removed
 // and only the beginning remains.  If |insert_ellipsis| is true, then an
 // ellipsis character will by inserted at the cut point.
 string16 CutString(const string16& text,
                    size_t length,
                    bool cut_in_middle,
                    bool insert_ellipsis) {
   // TODO(tony): This is wrong, it might split the string in the middle of a
   // surrogate pair.
   const string16 kInsert = insert_ellipsis ? UTF8ToUTF16(kEllipsis) :
                                              ASCIIToUTF16("");
   if (!cut_in_middle)
     return text.substr(0, length) + kInsert;
   // We put the extra character, if any, before the cut.
   const size_t half_length = length / 2;
   return text.substr(0, length - half_length) + kInsert +
       text.substr(text.length() - half_length, half_length);
 }
 
 }  // namespace
 
-namespace gfx {
-
 // This function takes a GURL object and elides it. It returns a string
 // which composed of parts from subdomain, domain, path, filename and query.
 // A "..." is added automatically at the end if the elided string is bigger
 // than the available pixel width. For available pixel width = 0, a formatted,
 // but un-elided, string is returned.
 //
 // TODO(pkasting): http://b/119635 This whole function gets
 // kerning/ligatures/etc. issues potentially wrong by assuming that the width of
 // a rendered string is always the sum of the widths of its substrings.  Also I
 // suspect it could be made simpler.
@@ skipping 593 matching lines @@
 namespace gfx {
 
 bool ElideRectangleString(const string16& input, size_t max_rows,
                           size_t max_cols, string16* output) {
   RectangleString rect(max_rows, max_cols, output);
   rect.Init();
   rect.AddString(input);
   return rect.Finalize();
 }
 
-}  // namespace gfx
-
+}  // namespace ui