summaryrefslogtreecommitdiffstats
path: root/ash/wm/panels
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-21 21:31:26 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-21 21:31:26 +0000
commitfcc51c95bcff73f377f4a2986d5cfb685b6af894 (patch)
treea5a92079c01fa4cfba1a25f48ed89153168181ca /ash/wm/panels
parent8c1e5e52ba640bc6a42a2cdfd25184f90a551975 (diff)
downloadchromium_src-fcc51c95bcff73f377f4a2986d5cfb685b6af894.zip
chromium_src-fcc51c95bcff73f377f4a2986d5cfb685b6af894.tar.gz
chromium_src-fcc51c95bcff73f377f4a2986d5cfb685b6af894.tar.bz2
Move root_window.* to window_event_dispatcher.*
http://crbug.com/308843 TBR=sky@chromium.org Review URL: https://codereview.chromium.org/174803002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252651 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/panels')
-rw-r--r--ash/wm/panels/panel_layout_manager.cc2
-rw-r--r--ash/wm/panels/panel_layout_manager_unittest.cc2
-rw-r--r--ash/wm/panels/panel_window_resizer.cc2
-rw-r--r--ash/wm/panels/panel_window_resizer_unittest.cc2
4 files changed, 4 insertions, 4 deletions
diff --git a/ash/wm/panels/panel_layout_manager.cc b/ash/wm/panels/panel_layout_manager.cc
index cc521f4..f4b0bde 100644
--- a/ash/wm/panels/panel_layout_manager.cc
+++ b/ash/wm/panels/panel_layout_manager.cc
@@ -26,8 +26,8 @@
#include "ui/aura/client/activation_client.h"
#include "ui/aura/client/focus_client.h"
#include "ui/aura/client/window_tree_client.h"
-#include "ui/aura/root_window.h"
#include "ui/aura/window.h"
+#include "ui/aura/window_event_dispatcher.h"
#include "ui/aura/window_tracker.h"
#include "ui/compositor/scoped_layer_animation_settings.h"
#include "ui/gfx/canvas.h"
diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc
index 54860ac..aabec58 100644
--- a/ash/wm/panels/panel_layout_manager_unittest.cc
+++ b/ash/wm/panels/panel_layout_manager_unittest.cc
@@ -30,10 +30,10 @@
#include "base/i18n/rtl.h"
#include "base/run_loop.h"
#include "ui/aura/client/aura_constants.h"
-#include "ui/aura/root_window.h"
#include "ui/aura/test/event_generator.h"
#include "ui/aura/test/test_windows.h"
#include "ui/aura/window.h"
+#include "ui/aura/window_event_dispatcher.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/views/corewm/corewm_switches.h"
#include "ui/views/widget/widget.h"
diff --git a/ash/wm/panels/panel_window_resizer.cc b/ash/wm/panels/panel_window_resizer.cc
index b1db4a5..c3d2885 100644
--- a/ash/wm/panels/panel_window_resizer.cc
+++ b/ash/wm/panels/panel_window_resizer.cc
@@ -19,9 +19,9 @@
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/client/window_tree_client.h"
#include "ui/aura/env.h"
-#include "ui/aura/root_window.h"
#include "ui/aura/window.h"
#include "ui/aura/window_delegate.h"
+#include "ui/aura/window_event_dispatcher.h"
#include "ui/base/hit_test.h"
#include "ui/base/ui_base_types.h"
#include "ui/gfx/screen.h"
diff --git a/ash/wm/panels/panel_window_resizer_unittest.cc b/ash/wm/panels/panel_window_resizer_unittest.cc
index 5939e6c..213708d 100644
--- a/ash/wm/panels/panel_window_resizer_unittest.cc
+++ b/ash/wm/panels/panel_window_resizer_unittest.cc
@@ -22,7 +22,7 @@
#include "ash/wm/window_state.h"
#include "base/win/windows_version.h"
#include "ui/aura/client/aura_constants.h"
-#include "ui/aura/root_window.h"
+#include "ui/aura/window_event_dispatcher.h"
#include "ui/base/hit_test.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/ui_base_types.h"