Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(193)

Side by Side Diff: chrome/browser/ui/views/tabs/window_finder_ash.cc

Issue 669243002: MacViews: Get c/b/ui/views/tabs to build on Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/coordinate_conversion.h"
9 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
10 #include "ui/aura/window_event_dispatcher.h" 10 #include "ui/aura/window_event_dispatcher.h"
11 11
12 namespace { 12 namespace {
13 13
14 aura::Window* GetLocalProcessWindowAtPointImpl( 14 gfx::NativeWindow GetLocalProcessWindowAtPointImpl(
15 const gfx::Point& screen_point, 15 const gfx::Point& screen_point,
16 const std::set<gfx::NativeView>& ignore, 16 const std::set<gfx::NativeWindow>& ignore,
17 aura::Window* window) { 17 gfx::NativeWindow window) {
18 if (ignore.find(window) != ignore.end()) 18 if (ignore.find(window) != ignore.end())
19 return NULL; 19 return NULL;
20 20
21 if (!window->IsVisible()) 21 if (!window->IsVisible())
22 return NULL; 22 return NULL;
23 23
24 if (window->id() == ash::kShellWindowId_PhantomWindow || 24 if (window->id() == ash::kShellWindowId_PhantomWindow ||
25 window->id() == ash::kShellWindowId_OverlayContainer || 25 window->id() == ash::kShellWindowId_OverlayContainer ||
26 window->id() == ash::kShellWindowId_MouseCursorContainer) 26 window->id() == ash::kShellWindowId_MouseCursorContainer)
27 return NULL; 27 return NULL;
28 28
29 if (window->layer()->type() == ui::LAYER_TEXTURED) 29 if (window->layer()->type() == ui::LAYER_TEXTURED)
30 return window->GetBoundsInScreen().Contains(screen_point) ? window : NULL; 30 return window->GetBoundsInScreen().Contains(screen_point) ? window : NULL;
31 31
32 for (aura::Window::Windows::const_reverse_iterator i = 32 for (aura::Window::Windows::const_reverse_iterator i =
33 window->children().rbegin(); i != window->children().rend(); ++i) { 33 window->children().rbegin(); i != window->children().rend(); ++i) {
34 aura::Window* result = 34 gfx::NativeWindow result =
35 GetLocalProcessWindowAtPointImpl(screen_point, ignore, *i); 35 GetLocalProcessWindowAtPointImpl(screen_point, ignore, *i);
36 if (result) 36 if (result)
37 return result; 37 return result;
38 } 38 }
39 return NULL; 39 return NULL;
40 } 40 }
41 41
42 } // namespace 42 } // namespace
43 43
44 aura::Window* GetLocalProcessWindowAtPointAsh( 44 gfx::NativeWindow GetLocalProcessWindowAtPointAsh(
45 const gfx::Point& screen_point, 45 const gfx::Point& screen_point,
46 const std::set<aura::Window*>& ignore) { 46 const std::set<gfx::NativeWindow>& ignore) {
47 return GetLocalProcessWindowAtPointImpl( 47 return GetLocalProcessWindowAtPointImpl(
48 screen_point, ignore, ::ash::wm::GetRootWindowAt(screen_point)); 48 screen_point, ignore, ::ash::wm::GetRootWindowAt(screen_point));
49 } 49 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/window_finder.h ('k') | chrome/browser/ui/views/tabs/window_finder_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698