| Index: ui/views/corewm/tooltip_controller.cc
|
| diff --git a/ui/views/corewm/tooltip_controller.cc b/ui/views/corewm/tooltip_controller.cc
|
| index ca27ffda3932a15fcb954aba931c035ed82ee9fc..c7f466b5e7edded4026a345990258384c33d6958 100644
|
| --- a/ui/views/corewm/tooltip_controller.cc
|
| +++ b/ui/views/corewm/tooltip_controller.cc
|
| @@ -97,7 +97,7 @@ aura::Window* GetTooltipTarget(const ui::MouseEvent& event,
|
| gfx::Point screen_loc(event.location());
|
| aura::client::GetScreenPositionClient(event_target->GetRootWindow())->
|
| ConvertPointToScreen(event_target, &screen_loc);
|
| - gfx::Screen* screen = gfx::Screen::GetScreenFor(event_target);
|
| + gfx::Screen* screen = gfx::Screen::GetScreen();
|
| aura::Window* target = screen->GetWindowAtScreenPoint(screen_loc);
|
| if (!target)
|
| return NULL;
|
| @@ -140,9 +140,8 @@ TooltipController::~TooltipController() {
|
| tooltip_window_->RemoveObserver(this);
|
| }
|
|
|
| -int TooltipController::GetMaxWidth(const gfx::Point& location,
|
| - gfx::NativeView context) const {
|
| - return tooltip_->GetMaxWidth(location, context);
|
| +int TooltipController::GetMaxWidth(const gfx::Point& location) const {
|
| + return tooltip_->GetMaxWidth(location);
|
| }
|
|
|
| void TooltipController::UpdateTooltip(aura::Window* target) {
|
|
|