| Index: ui/views/widget/tooltip_manager_aura.cc
|
| diff --git a/ui/views/widget/tooltip_manager_aura.cc b/ui/views/widget/tooltip_manager_aura.cc
|
| index cfc4c61b36e02bc43f043b96b8cc8587a2e1b6f6..cf873e5e9e638241d6903e9be30eed51e969b6ca 100644
|
| --- a/ui/views/widget/tooltip_manager_aura.cc
|
| +++ b/ui/views/widget/tooltip_manager_aura.cc
|
| @@ -24,12 +24,15 @@ int TooltipManager::GetTooltipHeight() {
|
|
|
| // static
|
| gfx::Font TooltipManager::GetDefaultFont() {
|
| - return aura::TooltipClient::GetDefaultFont();
|
| + return ui::ResourceBundle::GetSharedInstance().GetFont(
|
| + ui::ResourceBundle::BaseFont);
|
| }
|
|
|
| // static
|
| int TooltipManager::GetMaxWidth(int x, int y) {
|
| - return aura::TooltipClient::GetMaxWidth(x, y);
|
| + gfx::Rect monitor_bounds =
|
| + gfx::Screen::GetMonitorAreaNearestPoint(gfx::Point(x, y));
|
| + return (monitor_bounds.width() + 1) / 2;
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
|
|