| Index: ui/views/controls/menu/menu_controller.cc
|
| diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc
|
| index 4511bef3a9414f8246fe07a62f4a6715b4651bbd..941ed8175d5fbad3f285b50814ef4677161029b5 100644
|
| --- a/ui/views/controls/menu/menu_controller.cc
|
| +++ b/ui/views/controls/menu/menu_controller.cc
|
| @@ -1100,14 +1100,14 @@ void MenuController::UpdateInitialLocation(
|
|
|
| // Calculate the bounds of the monitor we'll show menus on. Do this once to
|
| // avoid repeated system queries for the info.
|
| - pending_state_.monitor_bounds = gfx::Screen::GetMonitorNearestPoint(
|
| + pending_state_.monitor_bounds = gfx::Screen::GetDisplayNearestPoint(
|
| bounds.origin()).work_area();
|
| #if defined(USE_ASH)
|
| if (!pending_state_.monitor_bounds.Contains(bounds)) {
|
| // Use the monitor area if the work area doesn't contain the bounds. This
|
| // handles showing a menu from the launcher.
|
| gfx::Rect monitor_area =
|
| - gfx::Screen::GetMonitorNearestPoint(bounds.origin()).bounds();
|
| + gfx::Screen::GetDisplayNearestPoint(bounds.origin()).bounds();
|
| if (monitor_area.Contains(bounds))
|
| pending_state_.monitor_bounds = monitor_area;
|
| }
|
|
|