Chromium Code Reviews| Index: chrome/browser/ui/views/tabs/window_finder_impl.cc |
| diff --git a/chrome/browser/ui/views/tabs/window_finder_ash.cc b/chrome/browser/ui/views/tabs/window_finder_impl.cc |
| similarity index 67% |
| copy from chrome/browser/ui/views/tabs/window_finder_ash.cc |
| copy to chrome/browser/ui/views/tabs/window_finder_impl.cc |
| index 1628a82d49f01dfa0ae962ce5d8efced3b7fa7da..5442879be59b2bd66d90e5566b82559bd7a9fa6c 100644 |
| --- a/chrome/browser/ui/views/tabs/window_finder_ash.cc |
| +++ b/chrome/browser/ui/views/tabs/window_finder_impl.cc |
| @@ -1,32 +1,24 @@ |
| -// Copyright 2014 The Chromium Authors. All rights reserved. |
| +// Copyright 2015 The Chromium Authors. All rights reserved. |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| #include "chrome/browser/ui/views/tabs/window_finder.h" |
| -#include "ash/shell_window_ids.h" |
| -#include "ash/wm/coordinate_conversion.h" |
| #include "ui/aura/client/screen_position_client.h" |
| #include "ui/aura/window.h" |
| #include "ui/aura/window_event_dispatcher.h" |
| +#include "ui/compositor/layer.h" |
| #include "ui/wm/core/window_util.h" |
| -namespace { |
| - |
| gfx::NativeWindow GetLocalProcessWindowAtPointImpl( |
| const gfx::Point& screen_point, |
| const std::set<gfx::NativeWindow>& ignore, |
| gfx::NativeWindow window) { |
|
mfomitchev
2015/10/23 18:28:29
Can we give a more descriptive name to "window"? r
bshe
2015/10/30 19:56:23
huh. Just realized the original function is a recu
|
| if (ignore.find(window) != ignore.end()) |
| - return NULL; |
| + return nullptr; |
| if (!window->IsVisible()) |
| - return NULL; |
| - |
| - if (window->id() == ash::kShellWindowId_PhantomWindow || |
| - window->id() == ash::kShellWindowId_OverlayContainer || |
| - window->id() == ash::kShellWindowId_MouseCursorContainer) |
| - return NULL; |
| + return nullptr; |
| if (window->layer()->type() == ui::LAYER_TEXTURED) { |
| // Returns the window that has visible layer and can hit the |
| @@ -47,14 +39,5 @@ gfx::NativeWindow GetLocalProcessWindowAtPointImpl( |
| if (result) |
| return result; |
| } |
| - return NULL; |
| -} |
| - |
| -} // namespace |
| - |
| -gfx::NativeWindow GetLocalProcessWindowAtPointAsh( |
| - const gfx::Point& screen_point, |
| - const std::set<gfx::NativeWindow>& ignore) { |
| - return GetLocalProcessWindowAtPointImpl( |
| - screen_point, ignore, ::ash::wm::GetRootWindowAt(screen_point)); |
| + return nullptr; |
| } |