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

Side by Side Diff: ash/wm/coordinate_conversion.cc

Issue 445703005: Revert of Moving coordinate conversion methods from ash/wm to ui/wm. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 months 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
« no previous file with comments | « ash/wm/coordinate_conversion.h ('k') | ash/wm/dock/docked_window_layout_manager_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
OLDNEW
« no previous file with comments | « ash/wm/coordinate_conversion.h ('k') | ash/wm/dock/docked_window_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698