diff options
| author | yusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 20:53:23 +0000 |
|---|---|---|
| committer | yusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 20:53:23 +0000 |
| commit | 718b26cd02ffe63b82650e81cb9bb5b0634d62c7 (patch) | |
| tree | a7b16b40dfe8f344b31b5c575c5acb61cb7f1af7 /ash/wm | |
| parent | a6b4ee0441f5e7199c583f924056dca14b889208 (diff) | |
| download | chromium_src-718b26cd02ffe63b82650e81cb9bb5b0634d62c7.zip chromium_src-718b26cd02ffe63b82650e81cb9bb5b0634d62c7.tar.gz chromium_src-718b26cd02ffe63b82650e81cb9bb5b0634d62c7.tar.bz2 | |
Move last_mouse_location_ from aura::RootWindow to aura::Env to support multiple root windows.
BUG=136814
TEST=1) the new ash_unittests as well as existing tests passed. 2) ran ash_shell by './out/Release/ash_shell --ash-extended-desktop --aura-host-window-size=100+0-500x500,610+0-300x300 --ash-virtual-screen-coordinates', then move the cursor to the second (right hand side) window, then click the right button. confirmed that the popup menu is shown on the right window.
Review URL: https://chromiumcodereview.appspot.com/10781028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148193 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm')
| -rw-r--r-- | ash/wm/shelf_layout_manager.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ash/wm/shelf_layout_manager.cc b/ash/wm/shelf_layout_manager.cc index b00f7f1..717425d 100644 --- a/ash/wm/shelf_layout_manager.cc +++ b/ash/wm/shelf_layout_manager.cc @@ -558,10 +558,9 @@ ShelfLayoutManager::AutoHideState ShelfLayoutManager::CalculateAutoHideState( if (event_filter_.get() && event_filter_->in_mouse_drag()) return AUTO_HIDE_HIDDEN; - aura::RootWindow* root = launcher_widget()->GetNativeView()->GetRootWindow(); bool mouse_over_launcher = launcher_widget()->GetWindowBoundsInScreen().Contains( - root->last_mouse_location()); + gfx::Screen::GetCursorScreenPoint()); return mouse_over_launcher ? AUTO_HIDE_SHOWN : AUTO_HIDE_HIDDEN; } |