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 1c5bd26c32e600e7e00f7013c15001777c9ce0a6..bb586d8e9167e6027d6e99a8c9594e835911fd0f 100644 |
--- a/ui/views/widget/tooltip_manager_aura.cc |
+++ b/ui/views/widget/tooltip_manager_aura.cc |
@@ -49,7 +49,7 @@ void TooltipManagerAura::UpdateTooltipManagerForCapture(Widget* source) { |
if (!screen_position_client) |
return; |
screen_position_client->ConvertPointToScreen(root_window, &screen_loc); |
- gfx::Screen* screen = gfx::Screen::GetScreenFor(root_window); |
+ gfx::Screen* screen = gfx::Screen::GetScreen(); |
aura::Window* target = screen->GetWindowAtScreenPoint(screen_loc); |
if (!target) |
return; |
@@ -81,10 +81,9 @@ const gfx::FontList& TooltipManagerAura::GetFontList() const { |
return GetDefaultFontList(); |
} |
-int TooltipManagerAura::GetMaxWidth(const gfx::Point& point, |
- aura::Window* context) const { |
- return aura::client::GetTooltipClient(context->GetRootWindow())-> |
- GetMaxWidth(point, context); |
+int TooltipManagerAura::GetMaxWidth(const gfx::Point& point) const { |
+ return aura::client::GetTooltipClient(GetWindow()->GetRootWindow()) |
+ ->GetMaxWidth(point); |
} |
void TooltipManagerAura::UpdateTooltip() { |
@@ -142,7 +141,7 @@ void TooltipManagerAura::UpdateTooltipForTarget(View* target, |
aura::client::GetTooltipClient(root_window)->UpdateTooltip(GetWindow()); |
} |
-aura::Window* TooltipManagerAura::GetWindow() { |
+aura::Window* TooltipManagerAura::GetWindow() const { |
return widget_->GetNativeView(); |
} |