Customize user details in ash system bubble for public account mode

ui/views/view_text_utils.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 "ui/views/view_text_utils.h"
 
 #include "base/i18n/bidi_line_iterator.h"
 #include "base/i18n/break_iterator.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 
 namespace view_text_utils {
 
 void DrawTextAndPositionUrl(gfx::Canvas* canvas,

[sky, 2012/11/13 17:47:01]

A method named DrawText should get a non-null canvas. Why the change?

[bartfab (slow), 2012/11/13 17:51:25]

Because I need a way to measure the text size without drawing it (so that the
View that uses this can compute its preferred size). The calculations for
measuring and drawing are absolutely identical and I wanted to avoid
copy&pasting the entire method.

                             views::Label* label,
                             const string16& text,
                             views::Link* link,
                             gfx::Rect* rect,
                             gfx::Size* position,
                             bool text_direction_is_rtl,
                             const gfx::Rect& bounds,
                             const gfx::Font& font) {
-  DCHECK(canvas && position);
+  DCHECK(position);
 
   // The |text| parameter is potentially a mix of LTR and RTL "runs," where
   // a run is a sequence of words that share the same directionality. We
   // initialize a bidirectional ICU line iterator and split the text into
   // runs that are either strictly LTR or strictly RTL, with no mix.
   base::i18n::BiDiLineIterator bidi_line;
   if (!bidi_line.Open(text, true, false))
     return;
 
   // Iterate over each run and draw it.
@@ skipping 81 matching lines @@
       x -= w;
       // When drawing LTR strings inside RTL text we need to make sure we
       // draw the trailing space (if one exists after the LTR text) to the
       // left of the LTR string.
       if (ltr_within_rtl && word[word.size() - 1] == ' ')
         x += gfx::Canvas::GetStringWidth(ASCIIToUTF16(" "), font);
     }
     int y = position->height() + bounds.y();
 
     // Draw the text on the screen (mirrored, if RTL run).
-    canvas->DrawStringInt(word, font, label->enabled_color(), x, y, w,
-                          font.GetHeight(), flags);
+    if (canvas) {
+      canvas->DrawStringInt(word, font, label->enabled_color(), x, y, w,
+                            font.GetHeight(), flags);
+    }
 
     if (!word.empty() && word[word.size() - 1] == '\x0a') {
       // When we come across '\n', we move to the beginning of the next line.
       position->set_width(0);
       position->Enlarge(0, font.GetHeight());
     } else {
       // Otherwise, we advance position to the next word.
       position->Enlarge(w, 0);
     }
 
     if (ltr_within_rtl)
       break;  // LTR within RTL is drawn as one unit, so we are done.
   }
 }
 
 void WrapIfWordDoesntFit(int word_width,
                          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