| 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/coordinate_conversion.h" | 5 #include "ash/wm/coordinate_conversion.h" |
| 6 | 6 |
| 7 #include "ash/display/display_controller.h" | 7 #include "ash/display/display_controller.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "ui/aura/client/screen_position_client.h" | 9 #include "ui/aura/client/screen_position_client.h" |
| 10 #include "ui/gfx/display.h" | 10 #include "ui/gfx/display.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 return Shell::GetInstance()->display_controller()-> | 24 return Shell::GetInstance()->display_controller()-> |
| 25 GetRootWindowForDisplayId(display.id()); | 25 GetRootWindowForDisplayId(display.id()); |
| 26 } | 26 } |
| 27 | 27 |
| 28 aura::Window* GetRootWindowMatching(const gfx::Rect& rect) { | 28 aura::Window* GetRootWindowMatching(const gfx::Rect& rect) { |
| 29 const gfx::Display& display = Shell::GetScreen()->GetDisplayMatching(rect); | 29 const gfx::Display& display = Shell::GetScreen()->GetDisplayMatching(rect); |
| 30 return Shell::GetInstance()->display_controller()-> | 30 return Shell::GetInstance()->display_controller()-> |
| 31 GetRootWindowForDisplayId(display.id()); | 31 GetRootWindowForDisplayId(display.id()); |
| 32 } | 32 } |
| 33 | 33 |
| 34 void ConvertPointToScreen(const aura::Window* window, gfx::Point* point) { |
| 35 CHECK(aura::client::GetScreenPositionClient(window->GetRootWindow())); |
| 36 aura::client::GetScreenPositionClient(window->GetRootWindow())-> |
| 37 ConvertPointToScreen(window, point); |
| 38 } |
| 39 |
| 40 void ConvertPointFromScreen(const aura::Window* window, |
| 41 gfx::Point* point_in_screen) { |
| 42 aura::client::GetScreenPositionClient(window->GetRootWindow())-> |
| 43 ConvertPointFromScreen(window, point_in_screen); |
| 44 } |
| 45 |
| 34 } // namespace wm | 46 } // namespace wm |
| 35 } // namespace ash | 47 } // namespace ash |
| OLD | NEW |