Index: ash/shell.cc |
diff --git a/ash/shell.cc b/ash/shell.cc |
index c6eb4d3773eaa1c164691ccd596b751986f9b65e..816dbec1970250ea971d170ca9e0d62266e53173 100644 |
--- a/ash/shell.cc |
+++ b/ash/shell.cc |
@@ -421,6 +421,12 @@ void Shell::Init() { |
AddEnvEventFilter(touch_observer_hud_.get()); |
} |
+ if (internal::DisplayController::IsExtendedDesktopEnabled()) { |
+ mouse_cursor_filter_.reset( |
+ new internal::MouseCursorEventFilter(display_controller_.get())); |
+ AddEnvEventFilter(mouse_cursor_filter_.get()); |
+ } |
+ |
// Create Controllers that may need root window. |
// TODO(oshima): Move as many controllers before creating |
// RootWindowController as possible. |
@@ -435,12 +441,6 @@ void Shell::Init() { |
magnification_controller_.reset( |
internal::MagnificationController::CreateInstance()); |
- if (internal::DisplayController::IsExtendedDesktopEnabled()) { |
- mouse_cursor_filter_.reset( |
- new internal::MouseCursorEventFilter(display_controller_.get())); |
- AddEnvEventFilter(mouse_cursor_filter_.get()); |
- } |
- |
high_contrast_controller_.reset(new HighContrastController); |
video_detector_.reset(new VideoDetector); |
window_cycle_controller_.reset( |