Fix Aura tooltip sizing and layout.

r296008 regressed TooltipAura vertical placement.
(that change removed vertical centering of multi-line text)
(TooltipAura implicitly used this for vertical padding)

Add an actual border and explicit Label sizing instead.
(this allocates space for the padding in the Label border)
(it also base-line centers the text in the correct bounds)

See before/after pics at http://crbug.com/417602#c5

BUG=417602
TEST=Chrome OS and "Windows 8 mode" Chrome tooltips look good.
R=sky@chromium.org

Review URL: https://codereview.chromium.org/602313002

Cr-Commit-Position: refs/heads/master@{#296874}

ui/views/corewm/tooltip_aura.cc

@@ -17,19 +17,12 @@
 
 namespace {
 
-const int kTooltipHorizontalPadding = 3;
-
 // Max visual tooltip width. If a tooltip is greater than this width, it will
 // be wrapped.
 const int kTooltipMaxWidthPixels = 400;
 
 const size_t kMaxLines = 10;
 
-// TODO(derat): This padding is needed on Chrome OS devices but seems excessive
-// when running the same binary on a Linux workstation; presumably there's a
-// difference in font metrics.  Rationalize this.
-const int kTooltipVerticalPadding = 2;
-
 // FIXME: get cursor offset from actual cursor size.
 const int kCursorOffsetX = 10;
 const int kCursorOffsetY = 15;
@@ -60,6 +53,12 @@ TooltipAura::TooltipAura(gfx::ScreenType screen_type)
       tooltip_window_(NULL) {
   label_.set_owned_by_client();
   label_.SetMultiLine(true);
+
+  const int kHorizontalPadding = 3;
+  const int kVerticalPadding = 2;
+  label_.SetBorder(Border::CreateEmptyBorder(
+      kVerticalPadding, kHorizontalPadding,
+      kVerticalPadding, kHorizontalPadding));
 }
 
 TooltipAura::~TooltipAura() {
@@ -151,11 +150,8 @@ int TooltipAura::GetMaxWidth(const gfx::Point& location) const {
 }
 
 void TooltipAura::SetTooltipBounds(const gfx::Point& mouse_pos,
-                                   int tooltip_width,
-                                   int tooltip_height) {
-  gfx::Rect tooltip_rect(mouse_pos.x(), mouse_pos.y(), tooltip_width,
-                         tooltip_height);
-
+                                   const gfx::Size& tooltip_size) {
+  gfx::Rect tooltip_rect(mouse_pos, tooltip_size);
   tooltip_rect.Offset(kCursorOffsetX, kCursorOffsetY);
   gfx::Screen* screen = gfx::Screen::GetScreenByType(screen_type_);
   gfx::Rect display_bounds(screen->GetDisplayNearestPoint(mouse_pos).bounds());
@@ -170,7 +166,7 @@ void TooltipAura::SetTooltipBounds(const gfx::Point& mouse_pos,
   // If tooltip is out of bounds on the y axis, we flip it to appear above the
   // mouse cursor instead of below.
   if (tooltip_rect.bottom() > display_bounds.bottom())
-    tooltip_rect.set_y(mouse_pos.y() - tooltip_height);
+    tooltip_rect.set_y(mouse_pos.y() - tooltip_size.height());
 
   tooltip_rect.AdjustToFit(display_bounds);
   widget_->SetBounds(tooltip_rect);
@@ -188,15 +184,13 @@ void TooltipAura::SetText(aura::Window* window,
                           const base::string16& tooltip_text,
                           const gfx::Point& location) {
   tooltip_window_ = window;
-  int max_width, line_count;
+  int max_width = 0;
+  int line_count = 0;
   base::string16 trimmed_text(tooltip_text);
   TrimTooltipToFit(label_.font_list(), GetMaxWidth(location), &trimmed_text,
                    &max_width, &line_count);
   label_.SetText(trimmed_text);
-
-  int width = max_width + 2 * kTooltipHorizontalPadding;
-  int height = label_.GetHeightForWidth(max_width) +
-      2 * kTooltipVerticalPadding;
+  label_.SizeToFit(max_width + label_.GetInsets().width());
 
   if (!widget_) {
     widget_ = CreateTooltipWidget(tooltip_window_);
@@ -204,7 +198,7 @@ void TooltipAura::SetText(aura::Window* window,
     widget_->AddObserver(this);
   }
 
-  SetTooltipBounds(location, width, height);
+  SetTooltipBounds(location, label_.size());
 
   ui::NativeTheme* native_theme = widget_->GetNativeTheme();
   label_.set_background(

ui/views/corewm/tooltip_aura.h

@@ -43,8 +43,7 @@ class VIEWS_EXPORT TooltipAura : public Tooltip, public WidgetObserver {
   // Adjusts the bounds given by the arguments to fit inside the desktop
   // and applies the adjusted bounds to the label_.
   void SetTooltipBounds(const gfx::Point& mouse_pos,
-                        int tooltip_width,
-                        int tooltip_height);
+                        const gfx::Size& tooltip_size);
 
   // Destroys |widget_|.
   void DestroyWidget();