| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ash/wm/common/root_window_finder.h" | 5 #include "ash/wm/common/root_window_finder.h" |
| 6 | 6 |
| 7 #include "ash/wm/common/wm_lookup.h" |
| 7 #include "ash/wm/common/wm_root_window_controller.h" | 8 #include "ash/wm/common/wm_root_window_controller.h" |
| 8 #include "ash/wm/common/wm_window.h" | 9 #include "ash/wm/common/wm_window.h" |
| 9 #include "ui/display/display.h" | 10 #include "ui/display/display.h" |
| 10 #include "ui/display/screen.h" | 11 #include "ui/display/screen.h" |
| 11 #include "ui/gfx/geometry/point.h" | 12 #include "ui/gfx/geometry/point.h" |
| 12 #include "ui/gfx/geometry/rect.h" | 13 #include "ui/gfx/geometry/rect.h" |
| 13 | 14 |
| 14 namespace ash { | 15 namespace ash { |
| 15 namespace wm { | 16 namespace wm { |
| 16 | 17 |
| 17 WmWindow* GetRootWindowAt(const gfx::Point& point) { | 18 WmWindow* GetRootWindowAt(const gfx::Point& point) { |
| 18 const display::Display& display = | 19 const display::Display& display = |
| 19 display::Screen::GetScreen()->GetDisplayNearestPoint(point); | 20 display::Screen::GetScreen()->GetDisplayNearestPoint(point); |
| 20 DCHECK(display.is_valid()); | 21 DCHECK(display.is_valid()); |
| 21 WmRootWindowController* root_window_controller = | 22 WmRootWindowController* root_window_controller = |
| 22 WmRootWindowController::GetWithDisplayId(display.id()); | 23 WmLookup::Get()->GetRootWindowControllerWithDisplayId(display.id()); |
| 23 return root_window_controller ? root_window_controller->GetWindow() : nullptr; | 24 return root_window_controller ? root_window_controller->GetWindow() : nullptr; |
| 24 } | 25 } |
| 25 | 26 |
| 26 WmWindow* GetRootWindowMatching(const gfx::Rect& rect) { | 27 WmWindow* GetRootWindowMatching(const gfx::Rect& rect) { |
| 27 const display::Display& display = | 28 const display::Display& display = |
| 28 display::Screen::GetScreen()->GetDisplayMatching(rect); | 29 display::Screen::GetScreen()->GetDisplayMatching(rect); |
| 29 WmRootWindowController* root_window_controller = | 30 WmRootWindowController* root_window_controller = |
| 30 WmRootWindowController::GetWithDisplayId(display.id()); | 31 WmLookup::Get()->GetRootWindowControllerWithDisplayId(display.id()); |
| 31 return root_window_controller ? root_window_controller->GetWindow() : nullptr; | 32 return root_window_controller ? root_window_controller->GetWindow() : nullptr; |
| 32 } | 33 } |
| 33 | 34 |
| 34 } // namespace wm | 35 } // namespace wm |
| 35 } // namespace ash | 36 } // namespace ash |
| OLD | NEW |