Add line height setting to views::Label & use it for notifications.

ui/views/controls/tree/tree_view.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/controls/tree/tree_view.h"
 
 #include <algorithm>
 
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
@@ skipping 642 matching lines @@
 
 void TreeView::ConfigureInternalNode(TreeModelNode* model_node,
                                      InternalNode* node) {
   node->Reset(model_node);
   UpdateNodeTextWidth(node);
 }
 
 void TreeView::UpdateNodeTextWidth(InternalNode* node) {
   int width = 0, height = 0;
   gfx::Canvas::SizeStringInt(node->model_node()->GetTitle(),
-      font_, &width, &height, gfx::Canvas::NO_ELLIPSIS);
+      font_, &width, &height, -1,  // -1 = Default line height.

[msw, 2013/04/17 20:12:59]

nit: skip the -1 comment, the function decl comment is sufficient.

[dharcourt, 2013/04/17 23:29:40]

Done.

+      gfx::Canvas::NO_ELLIPSIS);
   node->set_text_width(width);
 }
 
 void TreeView::DrawnNodesChanged() {
   UpdatePreferredSize();
   PreferredSizeChanged();
   SchedulePaint();
 }
 
 void TreeView::UpdatePreferredSize() {
@@ skipping 324 matching lines @@
   if (!is_expanded_)
     return max_width;
   for (int i = 0; i < child_count(); ++i) {
     max_width = std::max(max_width,
                          GetChild(i)->GetMaxWidth(indent, depth + 1));
   }
   return max_width;
 }
 
 }  // namespace views