summaryrefslogtreecommitdiffstats
path: root/ui/aura
diff options
context:
space:
mode:
Diffstat (limited to 'ui/aura')
-rw-r--r--ui/aura/env.h2
-rw-r--r--ui/aura/gestures/gesture_recognizer_unittest.cc2
-rw-r--r--ui/aura/remote_window_tree_host_win.cc2
-rw-r--r--ui/aura/window.h2
-rw-r--r--ui/aura/window_event_dispatcher.h2
-rw-r--r--ui/aura/window_event_dispatcher_unittest.cc2
-rw-r--r--ui/aura/window_tree_host.cc8
-rw-r--r--ui/aura/window_tree_host_mac.h2
-rw-r--r--ui/aura/window_tree_host_win.cc2
-rw-r--r--ui/aura/window_tree_host_x11.h2
10 files changed, 13 insertions, 13 deletions
diff --git a/ui/aura/env.h b/ui/aura/env.h
index f04c7a5..4ae2d69 100644
--- a/ui/aura/env.h
+++ b/ui/aura/env.h
@@ -11,7 +11,7 @@
#include "ui/aura/aura_export.h"
#include "ui/events/event_handler.h"
#include "ui/events/event_target.h"
-#include "ui/gfx/point.h"
+#include "ui/gfx/geometry/point.h"
namespace ui {
class ContextFactory;
diff --git a/ui/aura/gestures/gesture_recognizer_unittest.cc b/ui/aura/gestures/gesture_recognizer_unittest.cc
index 23cbfbde..4a73acf 100644
--- a/ui/aura/gestures/gesture_recognizer_unittest.cc
+++ b/ui/aura/gestures/gesture_recognizer_unittest.cc
@@ -24,7 +24,7 @@
#include "ui/events/gestures/gesture_types.h"
#include "ui/events/test/event_generator.h"
#include "ui/events/test/events_test_utils.h"
-#include "ui/gfx/point.h"
+#include "ui/gfx/geometry/point.h"
#include "ui/gfx/rect.h"
#include <queue>
diff --git a/ui/aura/remote_window_tree_host_win.cc b/ui/aura/remote_window_tree_host_win.cc
index 6d4367b..3b34357 100644
--- a/ui/aura/remote_window_tree_host_win.cc
+++ b/ui/aura/remote_window_tree_host_win.cc
@@ -23,7 +23,7 @@
#include "ui/base/view_prop.h"
#include "ui/events/event_utils.h"
#include "ui/events/keycodes/keyboard_code_conversion_win.h"
-#include "ui/gfx/insets.h"
+#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/win/dpi.h"
#include "ui/metro_viewer/metro_viewer_messages.h"
diff --git a/ui/aura/window.h b/ui/aura/window.h
index d1cff7b..3d99452 100644
--- a/ui/aura/window.h
+++ b/ui/aura/window.h
@@ -24,7 +24,7 @@
#include "ui/events/event_target.h"
#include "ui/events/event_targeter.h"
#include "ui/events/gestures/gesture_types.h"
-#include "ui/gfx/insets.h"
+#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/rect.h"
#include "ui/wm/public/window_types.h"
diff --git a/ui/aura/window_event_dispatcher.h b/ui/aura/window_event_dispatcher.h
index 6b1cadc..d2ea8a9 100644
--- a/ui/aura/window_event_dispatcher.h
+++ b/ui/aura/window_event_dispatcher.h
@@ -24,8 +24,8 @@
#include "ui/events/event_targeter.h"
#include "ui/events/gestures/gesture_recognizer.h"
#include "ui/events/gestures/gesture_types.h"
+#include "ui/gfx/geometry/point.h"
#include "ui/gfx/native_widget_types.h"
-#include "ui/gfx/point.h"
namespace gfx {
class Size;
diff --git a/ui/aura/window_event_dispatcher_unittest.cc b/ui/aura/window_event_dispatcher_unittest.cc
index b9994ed..1f1d4fe 100644
--- a/ui/aura/window_event_dispatcher_unittest.cc
+++ b/ui/aura/window_event_dispatcher_unittest.cc
@@ -29,7 +29,7 @@
#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/events/test/event_generator.h"
#include "ui/events/test/test_event_handler.h"
-#include "ui/gfx/point.h"
+#include "ui/gfx/geometry/point.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/screen.h"
#include "ui/gfx/transform.h"
diff --git a/ui/aura/window_tree_host.cc b/ui/aura/window_tree_host.cc
index bbe52fc..a96c94d 100644
--- a/ui/aura/window_tree_host.cc
+++ b/ui/aura/window_tree_host.cc
@@ -17,10 +17,10 @@
#include "ui/compositor/dip_util.h"
#include "ui/compositor/layer.h"
#include "ui/gfx/display.h"
-#include "ui/gfx/insets.h"
-#include "ui/gfx/point.h"
-#include "ui/gfx/point3_f.h"
-#include "ui/gfx/point_conversions.h"
+#include "ui/gfx/geometry/insets.h"
+#include "ui/gfx/geometry/point.h"
+#include "ui/gfx/geometry/point3_f.h"
+#include "ui/gfx/geometry/point_conversions.h"
#include "ui/gfx/screen.h"
#include "ui/gfx/size_conversions.h"
diff --git a/ui/aura/window_tree_host_mac.h b/ui/aura/window_tree_host_mac.h
index f71f167..45063c1 100644
--- a/ui/aura/window_tree_host_mac.h
+++ b/ui/aura/window_tree_host_mac.h
@@ -10,7 +10,7 @@
#include "base/mac/scoped_nsobject.h"
#include "ui/aura/aura_export.h"
#include "ui/aura/window_tree_host.h"
-#include "ui/gfx/insets.h"
+#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/rect.h"
namespace ui {
diff --git a/ui/aura/window_tree_host_win.cc b/ui/aura/window_tree_host_win.cc
index 9a30344..f046c20 100644
--- a/ui/aura/window_tree_host_win.cc
+++ b/ui/aura/window_tree_host_win.cc
@@ -16,7 +16,7 @@
#include "ui/compositor/compositor.h"
#include "ui/events/event.h"
#include "ui/gfx/display.h"
-#include "ui/gfx/insets.h"
+#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/screen.h"
#include "ui/platform_window/win/win_window.h"
diff --git a/ui/aura/window_tree_host_x11.h b/ui/aura/window_tree_host_x11.h
index aff874c..428c7de 100644
--- a/ui/aura/window_tree_host_x11.h
+++ b/ui/aura/window_tree_host_x11.h
@@ -10,7 +10,7 @@
#include "ui/aura/window_tree_host.h"
#include "ui/events/event_source.h"
#include "ui/events/platform/platform_event_dispatcher.h"
-#include "ui/gfx/insets.h"
+#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/x/x11_atom_cache.h"