summaryrefslogtreecommitdiffstats
path: root/ash/magnifier
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-20 20:54:57 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-20 20:54:57 +0000
commit7a60cd3a87912064436bc1f12d6b2ea3abddf961 (patch)
tree35324f6c57f6f39ae9f733b2b133488ab8892022 /ash/magnifier
parenta72ef03eaa3b29a137c7d5953bcf3e124a76cf54 (diff)
downloadchromium_src-7a60cd3a87912064436bc1f12d6b2ea3abddf961.zip
chromium_src-7a60cd3a87912064436bc1f12d6b2ea3abddf961.tar.gz
chromium_src-7a60cd3a87912064436bc1f12d6b2ea3abddf961.tar.bz2
Remove window/host accessors from WindowEventDispatcher. Include-What-You-Use for WindowTreeHost.
TBR=sky@chromium.org http://crbug.com/308843 Review URL: https://codereview.chromium.org/196383014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258401 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/magnifier')
-rw-r--r--ash/magnifier/magnification_controller.cc2
-rw-r--r--ash/magnifier/magnification_controller_unittest.cc2
-rw-r--r--ash/magnifier/partial_magnification_controller.cc3
3 files changed, 4 insertions, 3 deletions
diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc
index 300e390..dd3b0d8 100644
--- a/ash/magnifier/magnification_controller.cc
+++ b/ash/magnifier/magnification_controller.cc
@@ -15,8 +15,8 @@
#include "ui/aura/client/cursor_client.h"
#include "ui/aura/root_window_transformer.h"
#include "ui/aura/window.h"
-#include "ui/aura/window_event_dispatcher.h"
#include "ui/aura/window_property.h"
+#include "ui/aura/window_tree_host.h"
#include "ui/compositor/dip_util.h"
#include "ui/compositor/layer.h"
#include "ui/compositor/layer_animation_observer.h"
diff --git a/ash/magnifier/magnification_controller_unittest.cc b/ash/magnifier/magnification_controller_unittest.cc
index 889b0a8..5ad2d12 100644
--- a/ash/magnifier/magnification_controller_unittest.cc
+++ b/ash/magnifier/magnification_controller_unittest.cc
@@ -11,7 +11,7 @@
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/env.h"
#include "ui/aura/test/event_generator.h"
-#include "ui/aura/window_event_dispatcher.h"
+#include "ui/aura/window_tree_host.h"
#include "ui/gfx/rect_conversions.h"
#include "ui/gfx/screen.h"
diff --git a/ash/magnifier/partial_magnification_controller.cc b/ash/magnifier/partial_magnification_controller.cc
index 4ff4845..38bf7f4 100644
--- a/ash/magnifier/partial_magnification_controller.cc
+++ b/ash/magnifier/partial_magnification_controller.cc
@@ -6,9 +6,10 @@
#include "ash/shell.h"
#include "ash/shell_window_ids.h"
-#include "ui/aura/window_event_dispatcher.h"
#include "ui/aura/window.h"
+#include "ui/aura/window_event_dispatcher.h"
#include "ui/aura/window_property.h"
+#include "ui/aura/window_tree_host.h"
#include "ui/gfx/screen.h"
#include "ui/compositor/layer.h"
#include "ui/views/layout/fill_layout.h"