Chromium Code Reviews| Index: ash/system/user/tray_user.cc |
| diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc |
| index de5f7cbd7fc34f637a19ff3324f2cf2ad52c3c73..7950e9476c751247de31ce9ad9aca90e73983d11 100644 |
| --- a/ash/system/user/tray_user.cc |
| +++ b/ash/system/user/tray_user.cc |
| @@ -272,10 +272,7 @@ void PublicAccountUserDetails::Layout() { |
| 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. |
| @@ -284,11 +281,9 @@ void PublicAccountUserDetails::Layout() { |
| 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); |