diff options
| author | hshi@chromium.org <hshi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-19 16:19:51 +0000 |
|---|---|---|
| committer | hshi@chromium.org <hshi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-19 16:19:51 +0000 |
| commit | 1d27ac1049bd3e8dc3c355a3b00e823558712627 (patch) | |
| tree | 077339b88eb1f7f50c2b1a7e2cf51ed96ae019a5 | |
| parent | f627c14aefbe84f9c59e9df857d586f0f6674385 (diff) | |
| download | chromium_src-1d27ac1049bd3e8dc3c355a3b00e823558712627.zip chromium_src-1d27ac1049bd3e8dc3c355a3b00e823558712627.tar.gz chromium_src-1d27ac1049bd3e8dc3c355a3b00e823558712627.tar.bz2 | |
Merge 289116 "Chrome OS: Fix tab mergeability with cursor compos..."
> Chrome OS: Fix tab mergeability with cursor compositing.
>
> Ash GetLocalProcessWindowAtPointImpl should ignore windows in the
> mouse cursor container.
>
> BUG=399309
> R=oshima@chromium.org, sky@chromium.org
> TBR=sky@chromium.org
> TEST=verify that tab merging works with large cursors.
>
> Review URL: https://codereview.chromium.org/468603002
TBR=hshi@chromium.org
Review URL: https://codereview.chromium.org/473673005
git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@290584 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/views/tabs/window_finder_ash.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/ui/views/tabs/window_finder_ash.cc b/chrome/browser/ui/views/tabs/window_finder_ash.cc index cdd9e68..0498888 100644 --- a/chrome/browser/ui/views/tabs/window_finder_ash.cc +++ b/chrome/browser/ui/views/tabs/window_finder_ash.cc @@ -22,7 +22,8 @@ aura::Window* GetLocalProcessWindowAtPointImpl( return NULL; if (window->id() == ash::kShellWindowId_PhantomWindow || - window->id() == ash::kShellWindowId_OverlayContainer) + window->id() == ash::kShellWindowId_OverlayContainer || + window->id() == ash::kShellWindowId_MouseCursorContainer) return NULL; if (window->layer()->type() == ui::LAYER_TEXTURED) |