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 "base/win/scoped_gdi_object.h" | 7 #include "base/win/scoped_gdi_object.h" |
8 #include "base/win/windows_version.h" | 8 #include "base/win/windows_version.h" |
9 #include "ui/aura/window.h" | 9 #include "ui/aura/window.h" |
10 #include "ui/gfx/screen.h" | 10 #include "ui/gfx/screen.h" |
11 #include "ui/gfx/win/dpi.h" | 11 #include "ui/gfx/win/dpi.h" |
12 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h" | 12 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h" |
13 #include "ui/views/win/hwnd_util.h" | 13 #include "ui/views/win/hwnd_util.h" |
14 | 14 |
15 #if defined(USE_ASH) | 15 #if defined(USE_ASH) |
16 aura::Window* GetLocalProcessWindowAtPointAsh( | 16 gfx::NativeWindow GetLocalProcessWindowAtPointAsh( |
17 const gfx::Point& screen_point, | 17 const gfx::Point& screen_point, |
18 const std::set<aura::Window*>& ignore); | 18 const std::set<gfx::NativeWindow>& ignore); |
19 #endif | 19 #endif |
20 | 20 |
21 namespace { | 21 namespace { |
22 | 22 |
23 // BaseWindowFinder ----------------------------------------------------------- | 23 // BaseWindowFinder ----------------------------------------------------------- |
24 | 24 |
25 // Base class used to locate a window. This is intended to be used with the | 25 // Base class used to locate a window. This is intended to be used with the |
26 // various win32 functions that iterate over windows. | 26 // various win32 functions that iterate over windows. |
27 // | 27 // |
28 // A subclass need only override ShouldStopIterating to determine when | 28 // A subclass need only override ShouldStopIterating to determine when |
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
211 for (; it != ignore.end(); ++it) { | 211 for (; it != ignore.end(); ++it) { |
212 HWND w = (*it)->GetHost()->GetAcceleratedWidget(); | 212 HWND w = (*it)->GetHost()->GetAcceleratedWidget(); |
213 if (w) | 213 if (w) |
214 hwnd_set.insert(w); | 214 hwnd_set.insert(w); |
215 } | 215 } |
216 return hwnd_set; | 216 return hwnd_set; |
217 } | 217 } |
218 | 218 |
219 } // namespace | 219 } // namespace |
220 | 220 |
221 aura::Window* GetLocalProcessWindowAtPoint( | 221 gfx::NativeWindow GetLocalProcessWindowAtPoint( |
222 chrome::HostDesktopType host_desktop_type, | 222 chrome::HostDesktopType host_desktop_type, |
223 const gfx::Point& screen_point, | 223 const gfx::Point& screen_point, |
224 const std::set<aura::Window*>& ignore) { | 224 const std::set<gfx::NativeWindow>& ignore) { |
225 #if defined(USE_ASH) | 225 #if defined(USE_ASH) |
226 if (host_desktop_type == chrome::HOST_DESKTOP_TYPE_ASH) | 226 if (host_desktop_type == chrome::HOST_DESKTOP_TYPE_ASH) |
227 return GetLocalProcessWindowAtPointAsh(screen_point, ignore); | 227 return GetLocalProcessWindowAtPointAsh(screen_point, ignore); |
228 #endif | 228 #endif |
229 return LocalProcessWindowFinder::GetProcessWindowAtPoint( | 229 return LocalProcessWindowFinder::GetProcessWindowAtPoint( |
230 screen_point, RemapIgnoreSet(ignore)); | 230 screen_point, RemapIgnoreSet(ignore)); |
231 } | 231 } |
OLD | NEW |