Replace StyleRange with BreakList; update RenderText, etc.

ash/system/user/tray_user.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 "ash/system/user/tray_user.h"
 
 #include <algorithm>
 #include <climits>
 #include <vector>
 
@@ skipping 254 matching lines @@
   for (std::vector<string16>::const_iterator it = lines.begin();
        it != lines.end(); ++it) {
     gfx::RenderText* line = gfx::RenderText::CreateInstance();
     line->SetDirectionalityMode(gfx::DIRECTIONALITY_FROM_UI);
     line->SetText(*it);
     const gfx::Size size(contents_area.width(), line->GetStringSize().height());
     line->SetDisplayRect(gfx::Rect(position, size));
     position.set_y(position.y() + size.height());
 
     // Set the default text color for the line.
-    gfx::StyleRange default_style(line->default_style());
-    default_style.foreground = kPublicAccountUserCardTextColor;
-    line->set_default_style(default_style);
-    line->ApplyDefaultStyle();
+    line->SetColor(kPublicAccountUserCardTextColor);
 
     // If a range of the line contains the user's display name, apply a custom
     // text color to it.
     if (display_name.is_empty())
       display_name.set_start(it->find(kDisplayNameMark));
     if (!display_name.is_empty()) {
       display_name.set_end(
           it->find(kDisplayNameMark, display_name.start() + 1));
-      gfx::StyleRange display_name_style(line->default_style());
-      display_name_style.foreground = kPublicAccountUserCardNameColor;
       ui::Range line_range(0, it->size());
-      display_name_style.range = display_name.Intersect(line_range);
-      line->ApplyStyleRange(display_name_style);
+      line->ApplyColor(kPublicAccountUserCardNameColor,
+          display_name.Intersect(line_range));

[Alexei Svitkine (slow), 2013/01/31 16:33:34]

Nit: Align.

[msw, 2013/01/31 20:27:39]

Done.

       // Update the range for the next line.
       if (display_name.end() >= line_range.end())
         display_name.set_start(0);
       else
         display_name = ui::Range::InvalidRange();
     }
 
     lines_.push_back(line);
   }
 
@@ skipping 338 matching lines @@
   // Check for null to avoid crbug.com/150944.
   if (avatar_) {
     avatar_->SetImage(
         ash::Shell::GetInstance()->system_tray_delegate()->GetUserImage(),
         gfx::Size(kUserIconSize, kUserIconSize));
   }
 }
 
 }  // namespace internal
 }  // namespace ash