Fix alignment format in multiline mode

ui/gfx/render_text.cc

Index: ui/gfx/render_text.cc
diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc
index 50d29e83fe14585dc6002bc9b2a502b49d5c0b31..59d1e3c62a51a2b8b9a2638a138f072451e439d3 100644
--- a/ui/gfx/render_text.cc
+++ b/ui/gfx/render_text.cc
@@ -1086,14 +1086,14 @@ HorizontalAlignment RenderText::GetCurrentHorizontalAlignment() {
 }
 
 Vector2d RenderText::GetAlignmentOffset(size_t line_number) {
-  // TODO(ckocagil): Enable |lines_| usage in other platforms.
-#if defined(OS_WIN)
+  // TODO(ckocagil): Enable |lines_| usage on mac.
+#if defined(OS_WIN) || defined(OS_CHROMEOS)

[msw, 2015/02/19 01:13:50]

This should actually check if the current instance is a RenderTextHarfBuzz
instance... RenderTextMac doesn't support multiline, but Mac also creates
RenderTextHarfBuzz instances via CreateInstanceForEditing. It'd be nice if you
can solve that elegantly, otherwise, I suppose you can just make this "if
!defined(OS_MACOSX)" for now; ditto below.

[oshima, 2015/02/19 04:40:14]

That means this is already broken and should be fixed separately.

This change was missing piece in mukai's@ multiline support CL for RTHB.

[oshima, 2015/02/23 18:50:53]

Used !defined(OS_MACOSX) in this CL. I uploaded the solution w/o ifdef in patch
set #3,
but want to do that in separate CL as I need to merge this to 42.

   DCHECK_LT(line_number, lines_.size());
 #endif
   Vector2d offset;
   HorizontalAlignment horizontal_alignment = GetCurrentHorizontalAlignment();
   if (horizontal_alignment != ALIGN_LEFT) {
-#if defined(OS_WIN)
+#if !defined(OS_WIN) || defined(OS_CHROMEOS)

[msw, 2015/02/19 01:13:50]

This is *definitely* wrong with the "!" added for OS_WIN; see above.

[oshima, 2015/02/23 18:50:53]

Sorry, this was from my experiment. (I was playing with this on/off).

I did clean up as you suggested.

     const int width = std::ceil(lines_[line_number].size.width()) +
         (cursor_enabled_ ? 1 : 0);
 #else