Commit 5c30d9f2 authored by benwells's avatar benwells Committed by Commit bot

Don't add an aura tooltip to bubble close buttons on Windows.

The Windows system automatically adds a tooltip to these buttons as the button returns HTCLOSE when nc hit tested. If we add the aura tooltip as well there are two tooltips shown.

BUG=471981

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

Cr-Commit-Position: refs/heads/master@{#324183}
parent 43a5cac4
...@@ -105,7 +105,11 @@ LabelButton* BubbleFrameView::CreateCloseButton(ButtonListener* listener) { ...@@ -105,7 +105,11 @@ LabelButton* BubbleFrameView::CreateCloseButton(ButtonListener* listener) {
*rb.GetImageNamed(IDR_CLOSE_DIALOG_P).ToImageSkia()); *rb.GetImageNamed(IDR_CLOSE_DIALOG_P).ToImageSkia());
close->SetBorder(nullptr); close->SetBorder(nullptr);
close->SetSize(close->GetPreferredSize()); close->SetSize(close->GetPreferredSize());
#if !defined(OS_WIN)
// Windows will automatically create a tooltip for the close button based on
// the HTCLOSE result from NonClientHitTest().
close->SetTooltipText(l10n_util::GetStringUTF16(IDS_APP_CLOSE)); close->SetTooltipText(l10n_util::GetStringUTF16(IDS_APP_CLOSE));
#endif
return close; return close;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment