| Index: chrome/browser/ui/ash/tabs/dock_info_ash.cc
|
| diff --git a/chrome/browser/ui/ash/tabs/dock_info_ash.cc b/chrome/browser/ui/ash/tabs/dock_info_ash.cc
|
| index da981df2f72ebb4bf7f501c44f93d95f8fad5418..c9592a99d3b509d5e47ffbaaea99e0c26a4bb02d 100644
|
| --- a/chrome/browser/ui/ash/tabs/dock_info_ash.cc
|
| +++ b/chrome/browser/ui/ash/tabs/dock_info_ash.cc
|
| @@ -28,13 +28,9 @@ aura::Window* GetLocalProcessWindowAtPointImpl(
|
| if (window->id() == ash::internal::kShellWindowId_PhantomWindow)
|
| return NULL;
|
|
|
| - if (window->layer()->type() == ui::LAYER_TEXTURED) {
|
| - gfx::Point window_point(screen_point);
|
| - aura::client::GetScreenPositionClient(window->GetRootWindow())->
|
| - ConvertPointFromScreen(window, &window_point);
|
| - return gfx::Rect(window->bounds().size()).Contains(window_point) ?
|
| - window : NULL;
|
| - }
|
| + if (window->layer()->type() == ui::LAYER_TEXTURED)
|
| + return window->GetBoundsInScreen().Contains(screen_point) ? window : NULL;
|
| +
|
| for (aura::Window::Windows::const_reverse_iterator i =
|
| window->children().rbegin(); i != window->children().rend(); ++i) {
|
| aura::Window* result =
|
|
|