| Index: chrome/browser/ui/views/tabs/window_finder_ash.cc
|
| diff --git a/chrome/browser/ui/views/tabs/window_finder_ash.cc b/chrome/browser/ui/views/tabs/window_finder_ash.cc
|
| index 049888821fa20b0ddd0b39897f8bc596900d643f..a0cbe04768e32634d0b2eca4638133409720753e 100644
|
| --- a/chrome/browser/ui/views/tabs/window_finder_ash.cc
|
| +++ b/chrome/browser/ui/views/tabs/window_finder_ash.cc
|
| @@ -11,10 +11,10 @@
|
|
|
| namespace {
|
|
|
| -aura::Window* GetLocalProcessWindowAtPointImpl(
|
| +gfx::NativeWindow GetLocalProcessWindowAtPointImpl(
|
| const gfx::Point& screen_point,
|
| - const std::set<gfx::NativeView>& ignore,
|
| - aura::Window* window) {
|
| + const std::set<gfx::NativeWindow>& ignore,
|
| + gfx::NativeWindow window) {
|
| if (ignore.find(window) != ignore.end())
|
| return NULL;
|
|
|
| @@ -31,7 +31,7 @@ aura::Window* GetLocalProcessWindowAtPointImpl(
|
|
|
| for (aura::Window::Windows::const_reverse_iterator i =
|
| window->children().rbegin(); i != window->children().rend(); ++i) {
|
| - aura::Window* result =
|
| + gfx::NativeWindow result =
|
| GetLocalProcessWindowAtPointImpl(screen_point, ignore, *i);
|
| if (result)
|
| return result;
|
| @@ -41,9 +41,9 @@ aura::Window* GetLocalProcessWindowAtPointImpl(
|
|
|
| } // namespace
|
|
|
| -aura::Window* GetLocalProcessWindowAtPointAsh(
|
| +gfx::NativeWindow GetLocalProcessWindowAtPointAsh(
|
| const gfx::Point& screen_point,
|
| - const std::set<aura::Window*>& ignore) {
|
| + const std::set<gfx::NativeWindow>& ignore) {
|
| return GetLocalProcessWindowAtPointImpl(
|
| screen_point, ignore, ::ash::wm::GetRootWindowAt(screen_point));
|
| }
|
|
|