| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/tabs/window_finder.h" | 5 #include "chrome/browser/ui/views/tabs/window_finder.h" |
| 6 | 6 |
| 7 #include "ash/shell_window_ids.h" | 7 #include "ash/shell_window_ids.h" |
| 8 #include "ash/wm/coordinate_conversion.h" | 8 #include "ash/wm/aura/wm_window_aura.h" |
| 9 #include "ash/wm/common/root_window_finder.h" |
| 9 #include "ui/aura/client/screen_position_client.h" | 10 #include "ui/aura/client/screen_position_client.h" |
| 10 #include "ui/aura/window.h" | 11 #include "ui/aura/window.h" |
| 11 #include "ui/aura/window_event_dispatcher.h" | 12 #include "ui/aura/window_event_dispatcher.h" |
| 12 #include "ui/wm/core/window_util.h" | 13 #include "ui/wm/core/window_util.h" |
| 13 | 14 |
| 14 namespace { | 15 namespace { |
| 15 | 16 |
| 16 gfx::NativeWindow GetLocalProcessWindowAtPointImpl( | 17 gfx::NativeWindow GetLocalProcessWindowAtPointImpl( |
| 17 const gfx::Point& screen_point, | 18 const gfx::Point& screen_point, |
| 18 const std::set<gfx::NativeWindow>& ignore, | 19 const std::set<gfx::NativeWindow>& ignore, |
| (...skipping 30 matching lines...) Expand all Loading... |
| 49 } | 50 } |
| 50 return NULL; | 51 return NULL; |
| 51 } | 52 } |
| 52 | 53 |
| 53 } // namespace | 54 } // namespace |
| 54 | 55 |
| 55 gfx::NativeWindow GetLocalProcessWindowAtPointAsh( | 56 gfx::NativeWindow GetLocalProcessWindowAtPointAsh( |
| 56 const gfx::Point& screen_point, | 57 const gfx::Point& screen_point, |
| 57 const std::set<gfx::NativeWindow>& ignore) { | 58 const std::set<gfx::NativeWindow>& ignore) { |
| 58 return GetLocalProcessWindowAtPointImpl( | 59 return GetLocalProcessWindowAtPointImpl( |
| 59 screen_point, ignore, ::ash::wm::GetRootWindowAt(screen_point)); | 60 screen_point, ignore, ash::wm::WmWindowAura::GetAuraWindow( |
| 61 ash::wm::GetRootWindowAt(screen_point))); |
| 60 } | 62 } |
| OLD | NEW |