Refactor WordIterator into base::BreakIterator....

views/view_text_utils.cc

 // 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 "views/view_text_utils.h"
 
 #include "app/bidi_line_iterator.h"
-#include "base/i18n/word_iterator.h"
+#include "base/i18n/break_iterator.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/color_utils.h"
 #include "gfx/size.h"
 #include "views/controls/label.h"
 #include "views/controls/link.h"
 
 namespace view_text_utils {
 
@@ skipping 72 matching lines @@
 #if defined(OS_WIN)
   const SkColor text_color = color_utils::GetSysSkColor(COLOR_WINDOWTEXT);
 #else
   // TODO(beng): source from theme provider.
   const SkColor text_color = SK_ColorBLACK;
 #endif
 
   // Iterate through line breaking opportunities (which in English would be
   // spaces and such). This tells us where to wrap.
   string16 text16(WideToUTF16(text));
-  WordIterator iter(&text16, WordIterator::BREAK_LINE);
+  base::BreakIterator iter(&text16, base::BreakIterator::BREAK_SPACE);
   if (!iter.Init())
     return;
 
   int flags = (text_direction_is_rtl ? gfx::Canvas::TEXT_ALIGN_RIGHT :
                                        gfx::Canvas::TEXT_ALIGN_LEFT);
   flags |= gfx::Canvas::MULTI_LINE | gfx::Canvas::HIDE_PREFIX;
 
   // Iterate over each word in the text, or put in a more locale-neutral way:
   // iterate to the next line breaking opportunity.
   while (iter.Advance()) {
     // Get the word and figure out the dimensions.
     std::wstring word;
     if (!ltr_within_rtl)
-      word = UTF16ToWide(iter.GetWord());  // Get the next word.
+      word = UTF16ToWide(iter.GetString());  // Get the next word.
     else
       word = text;  // Draw the whole text at once.
 
     int w = font.GetStringWidth(word), h = font.GetHeight();
     gfx::CanvasSkia::SizeStringInt(WideToUTF16Hack(word), font, &w, &h, flags);
 
     // If we exceed the boundaries, we need to wrap.
     WrapIfWordDoesntFit(w, font.GetHeight(), position, bounds);
 
     int x = label->MirroredXCoordinateInsideView(position->width()) +
@@ skipping 34 matching lines @@
                          int font_height,
                          gfx::Size* position,
                          const gfx::Rect& bounds) {
   if (position->width() + word_width > bounds.right()) {
     position->set_width(0);
     position->Enlarge(0, font_height);
   }
 }
 
 }  // namespace view_text_utils