base/i18n: Add namespace i18n to CharIterator.

app/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 "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 {
 
 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,
@@ skipping 576 matching lines @@
 void RectangleString::AddWord(const string16& word) {
   if (word.length() < max_cols_) {
     // Word can be made to fit, no need to fragment it.
     if (current_col_ + word.length() >= max_cols_)
       NewLine();
     Append(word);
   } else {
     // Word is so big that it must be fragmented.
     int array_start = 0;
     int char_start = 0;
-    base::UTF16CharIterator chars(&word);
+    base::i18n::UTF16CharIterator chars(&word);
     while (!chars.end()) {
       // When boundary is hit, add as much as will fit on this line.
       if (current_col_ + (chars.char_pos() - char_start) >= max_cols_) {
         Append(word.substr(array_start, chars.array_pos() - array_start));
         NewLine();
         array_start = chars.array_pos();
         char_start = chars.char_pos();
       }
       chars.Advance();
     }
@@ skipping 27 matching lines @@
 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