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

Unified 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: rebase 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/wm/core/coordinate_conversion.h ('k') | ui/wm/core/coordinate_conversion_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/wm/core/coordinate_conversion.cc
diff --git a/ui/wm/core/coordinate_conversion.cc b/ui/wm/core/coordinate_conversion.cc
index 1d97f04f028b77142df28ad6abda174162b042f9..17104b357eb33f33a371d6adef6b8bbaf2685731 100644
--- a/ui/wm/core/coordinate_conversion.cc
+++ b/ui/wm/core/coordinate_conversion.cc
@@ -6,6 +6,10 @@
#include "ui/aura/client/screen_position_client.h"
#include "ui/gfx/geometry/point.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/rect_conversions.h"
+#include "ui/gfx/geometry/rect_f.h"
+#include "ui/gfx/transform.h"
namespace wm {
@@ -26,4 +30,17 @@ void ConvertPointFromScreen(const aura::Window* window,
ConvertPointFromScreen(window, point_in_screen);
}
+void ConvertRectToScreen(const aura::Window* window, gfx::Rect* rect) {
+ gfx::Point origin = rect->origin();
+ ConvertPointToScreen(window, &origin);
+ rect->set_origin(origin);
+}
+
+void ConvertRectFromScreen(const aura::Window* window,
+ gfx::Rect* rect_in_screen) {
+ gfx::Point origin = rect_in_screen->origin();
+ ConvertPointFromScreen(window, &origin);
+ rect_in_screen->set_origin(origin);
+}
+
} // namespace wm
« no previous file with comments | « ui/wm/core/coordinate_conversion.h ('k') | ui/wm/core/coordinate_conversion_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698