summaryrefslogtreecommitdiffstats
path: root/ui/wm
diff options
context:
space:
mode:
Diffstat (limited to 'ui/wm')
-rw-r--r--ui/wm/core/image_grid.cc4
-rw-r--r--ui/wm/core/image_grid.h2
-rw-r--r--ui/wm/core/window_animations.cc2
-rw-r--r--ui/wm/core/window_animations_unittest.cc2
-rw-r--r--ui/wm/public/window_move_client.h2
5 files changed, 6 insertions, 6 deletions
diff --git a/ui/wm/core/image_grid.cc b/ui/wm/core/image_grid.cc
index 8441965..3f90efe 100644
--- a/ui/wm/core/image_grid.cc
+++ b/ui/wm/core/image_grid.cc
@@ -12,10 +12,10 @@
#include "ui/gfx/canvas.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/rect_conversions.h"
+#include "ui/gfx/geometry/size.h"
+#include "ui/gfx/geometry/size_conversions.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia_operations.h"
-#include "ui/gfx/size.h"
-#include "ui/gfx/size_conversions.h"
#include "ui/gfx/transform.h"
using std::max;
diff --git a/ui/wm/core/image_grid.h b/ui/wm/core/image_grid.h
index cc622ad..f58ffbb 100644
--- a/ui/wm/core/image_grid.h
+++ b/ui/wm/core/image_grid.h
@@ -11,8 +11,8 @@
#include "ui/compositor/layer.h"
#include "ui/compositor/layer_delegate.h"
#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/size.h"
#include "ui/gfx/image/image_skia.h"
-#include "ui/gfx/size.h"
#include "ui/wm/wm_export.h"
namespace gfx {
diff --git a/ui/wm/core/window_animations.cc b/ui/wm/core/window_animations.cc
index 574f56b3..0aa3caa 100644
--- a/ui/wm/core/window_animations.cc
+++ b/ui/wm/core/window_animations.cc
@@ -30,10 +30,10 @@
#include "ui/compositor/scoped_layer_animation_settings.h"
#include "ui/gfx/animation/animation.h"
#include "ui/gfx/geometry/rect_conversions.h"
+#include "ui/gfx/geometry/vector2d.h"
#include "ui/gfx/geometry/vector3d_f.h"
#include "ui/gfx/interpolated_transform.h"
#include "ui/gfx/screen.h"
-#include "ui/gfx/vector2d.h"
#include "ui/wm/core/window_util.h"
#include "ui/wm/core/wm_core_switches.h"
#include "ui/wm/public/animation_host.h"
diff --git a/ui/wm/core/window_animations_unittest.cc b/ui/wm/core/window_animations_unittest.cc
index 095ea02..2739fd0 100644
--- a/ui/wm/core/window_animations_unittest.cc
+++ b/ui/wm/core/window_animations_unittest.cc
@@ -12,7 +12,7 @@
#include "ui/compositor/layer_animator.h"
#include "ui/compositor/scoped_animation_duration_scale_mode.h"
#include "ui/gfx/animation/animation_container_element.h"
-#include "ui/gfx/vector2d.h"
+#include "ui/gfx/geometry/vector2d.h"
#include "ui/wm/core/transient_window_manager.h"
#include "ui/wm/core/transient_window_stacking_client.h"
#include "ui/wm/core/window_util.h"
diff --git a/ui/wm/public/window_move_client.h b/ui/wm/public/window_move_client.h
index b8943d3..fbfa92d 100644
--- a/ui/wm/public/window_move_client.h
+++ b/ui/wm/public/window_move_client.h
@@ -6,7 +6,7 @@
#define UI_WM_PUBLIC_WINDOW_MOVE_CLIENT_H_
#include "ui/aura/aura_export.h"
-#include "ui/gfx/vector2d.h"
+#include "ui/gfx/geometry/vector2d.h"
namespace gfx {
class Point;