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

Side by Side Diff: ui/wm/core/coordinate_conversion.cc

Issue 2660873002: Move two utility functions from ash/screen_util.h to ui/wm/core/coordinate_conversion.h (Closed)
Patch Set: Created 3 years, 10 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
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 "ui/wm/core/coordinate_conversion.h" 5 #include "ui/wm/core/coordinate_conversion.h"
6 6
7 #include "ui/aura/client/screen_position_client.h" 7 #include "ui/aura/client/screen_position_client.h"
8 #include "ui/gfx/geometry/point.h" 8 #include "ui/gfx/geometry/point.h"
9 #include "ui/gfx/geometry/rect.h"
9 10
10 namespace wm { 11 namespace wm {
11 12
12 void ConvertPointToScreen(const aura::Window* window, gfx::Point* point) { 13 void ConvertPointToScreen(const aura::Window* window, gfx::Point* point) {
13 DCHECK(window); 14 DCHECK(window);
14 DCHECK(window->GetRootWindow()); 15 DCHECK(window->GetRootWindow());
15 DCHECK(aura::client::GetScreenPositionClient(window->GetRootWindow())); 16 DCHECK(aura::client::GetScreenPositionClient(window->GetRootWindow()));
16 aura::client::GetScreenPositionClient(window->GetRootWindow())-> 17 aura::client::GetScreenPositionClient(window->GetRootWindow())->
17 ConvertPointToScreen(window, point); 18 ConvertPointToScreen(window, point);
18 } 19 }
19 20
20 void ConvertPointFromScreen(const aura::Window* window, 21 void ConvertPointFromScreen(const aura::Window* window,
21 gfx::Point* point_in_screen) { 22 gfx::Point* point_in_screen) {
22 DCHECK(window); 23 DCHECK(window);
23 DCHECK(window->GetRootWindow()); 24 DCHECK(window->GetRootWindow());
24 DCHECK(aura::client::GetScreenPositionClient(window->GetRootWindow())); 25 DCHECK(aura::client::GetScreenPositionClient(window->GetRootWindow()));
25 aura::client::GetScreenPositionClient(window->GetRootWindow())-> 26 aura::client::GetScreenPositionClient(window->GetRootWindow())->
26 ConvertPointFromScreen(window, point_in_screen); 27 ConvertPointFromScreen(window, point_in_screen);
27 } 28 }
28 29
30 gfx::Rect ConvertRectToScreen(const aura::Window* window,
31 const gfx::Rect& rect) {
32 gfx::Point point = rect.origin();
33 ConvertPointToScreen(window, &point);
34 return gfx::Rect(point, rect.size());
35 }
36
37 gfx::Rect ConvertRectFromScreen(const aura::Window* window,
38 const gfx::Rect& rect) {
39 gfx::Point point = rect.origin();
40 ConvertPointFromScreen(window, &point);
41 return gfx::Rect(point, rect.size());
42 }
43
29 } // namespace wm 44 } // namespace wm
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698