summaryrefslogtreecommitdiffstats
path: root/ash/touch
diff options
context:
space:
mode:
authorAvi Drissman <avi@chromium.org>2014-12-22 14:25:29 -0500
committerAvi Drissman <avi@chromium.org>2014-12-22 19:25:36 +0000
commitfefc2f865f1735a7a84c0cf4a9f30e36e1bb8542 (patch)
tree2f9d1f57245f15fc23b8dd5c9d79535b6d773e2b /ash/touch
parent70a416cda7ed16e55f3c3c32bb25457cba1feaa5 (diff)
downloadchromium_src-fefc2f865f1735a7a84c0cf4a9f30e36e1bb8542.zip
chromium_src-fefc2f865f1735a7a84c0cf4a9f30e36e1bb8542.tar.gz
chromium_src-fefc2f865f1735a7a84c0cf4a9f30e36e1bb8542.tar.bz2
Fix references to ui/gfx headers in a*/.
BUG=444596 TEST=none TBR=ben@chromium.org Review URL: https://codereview.chromium.org/802473003 Cr-Commit-Position: refs/heads/master@{#309448}
Diffstat (limited to 'ash/touch')
-rw-r--r--ash/touch/touch_hud_debug.cc2
-rw-r--r--ash/touch/touch_hud_projection.cc2
-rw-r--r--ash/touch/touch_observer_hud.cc4
-rw-r--r--ash/touch/touch_uma.cc2
-rw-r--r--ash/touch/touch_uma.h2
5 files changed, 6 insertions, 6 deletions
diff --git a/ash/touch/touch_hud_debug.cc b/ash/touch/touch_hud_debug.cc
index c0c6469..367c68e 100644
--- a/ash/touch/touch_hud_debug.cc
+++ b/ash/touch/touch_hud_debug.cc
@@ -17,7 +17,7 @@
#include "ui/gfx/animation/animation_delegate.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/display.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/size.h"
#include "ui/gfx/transform.h"
#include "ui/views/controls/label.h"
#include "ui/views/layout/box_layout.h"
diff --git a/ash/touch/touch_hud_projection.cc b/ash/touch/touch_hud_projection.cc
index 47fab8d..94bffce 100644
--- a/ash/touch/touch_hud_projection.cc
+++ b/ash/touch/touch_hud_projection.cc
@@ -11,7 +11,7 @@
#include "ui/gfx/animation/animation_delegate.h"
#include "ui/gfx/animation/linear_animation.h"
#include "ui/gfx/canvas.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/size.h"
#include "ui/views/widget/widget.h"
namespace ash {
diff --git a/ash/touch/touch_observer_hud.cc b/ash/touch/touch_observer_hud.cc
index f3f0b35..02f85ad 100644
--- a/ash/touch/touch_observer_hud.cc
+++ b/ash/touch/touch_observer_hud.cc
@@ -10,9 +10,9 @@
#include "ash/shell_window_ids.h"
#include "ui/aura/window_event_dispatcher.h"
#include "ui/gfx/display.h"
-#include "ui/gfx/rect.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/size.h"
#include "ui/gfx/screen.h"
-#include "ui/gfx/size.h"
#include "ui/views/widget/widget.h"
namespace ash {
diff --git a/ash/touch/touch_uma.cc b/ash/touch/touch_uma.cc
index 04948d2..1b9348a 100644
--- a/ash/touch/touch_uma.cc
+++ b/ash/touch/touch_uma.cc
@@ -14,7 +14,7 @@
#include "ui/aura/window_property.h"
#include "ui/events/event.h"
#include "ui/events/event_utils.h"
-#include "ui/gfx/point_conversions.h"
+#include "ui/gfx/geometry/point_conversions.h"
#if defined(USE_X11)
#include <X11/extensions/XInput2.h>
diff --git a/ash/touch/touch_uma.h b/ash/touch/touch_uma.h
index eb0b4f6..5b29ef3 100644
--- a/ash/touch/touch_uma.h
+++ b/ash/touch/touch_uma.h
@@ -9,7 +9,7 @@
#include "ash/shell.h"
#include "base/memory/singleton.h"
-#include "ui/gfx/point.h"
+#include "ui/gfx/geometry/point.h"
#include "ui/views/widget/widget.h"
namespace aura {