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

ui/views/controls/button/text_button.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/button/text_button.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
@@ skipping 358 matching lines @@
   }
 }
 
 void TextButtonBase::CalculateTextSize(gfx::Size* text_size, int max_width) {
   int h = font_.GetHeight();
   int w = multi_line_ ? max_width : 0;
   int flags = ComputeCanvasStringFlags();
   if (!multi_line_)
     flags |= gfx::Canvas::NO_ELLIPSIS;
 
-  gfx::Canvas::SizeStringInt(text_, font_, &w, &h, flags);
+  gfx::Canvas::SizeStringInt(text_, font_, &w, &h, 0, flags);
   text_size->SetSize(w, h);
 }
 
 int TextButtonBase::ComputeCanvasStringFlags() const {
   if (!multi_line_)
     return 0;
 
   int flags = gfx::Canvas::MULTI_LINE;
   switch (alignment_) {
     case ALIGN_LEFT:
@@ skipping 101 matching lines @@
                             draw_string_flags);
 #endif
     } else {
       gfx::ShadowValues shadows;
       if (has_text_shadow_) {
         SkColor color = GetWidget()->IsActive() ? active_text_shadow_color_ :
                                                   inactive_text_shadow_color_;
         shadows.push_back(gfx::ShadowValue(text_shadow_offset_, 0, color));
       }
       canvas->DrawStringWithShadows(text_, font_, text_color, text_bounds,
-                                    draw_string_flags, shadows);
+                                    0, draw_string_flags, shadows);
     }
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TextButtonBase, View overrides:
 
 gfx::Size TextButtonBase::GetMinimumSize() {
   return max_text_size_;
 }
@@ skipping 300 matching lines @@
   // when not using NativeThemeWin.
 #if defined(OS_WIN)
   if (GetNativeTheme() == ui::NativeThemeWin::instance())
     return;
 #endif
   params->button.is_focused = HasFocus() &&
       (focusable() || IsAccessibilityFocusable());
 }
 
 }  // namespace views