Add EnvEventFilter to filter events before root window process event
Factor out CursorManager from RootWindowEventFilter

Review URL: https://chromiumcodereview.appspot.com/10444107

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140714 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ash/wm/shelf_layout_manager.cc b/ash/wm/shelf_layout_manager.cc
index 16345573..3f2e857 100644
--- a/ash/wm/shelf_layout_manager.cc
+++ b/ash/wm/shelf_layout_manager.cc
@@ -78,11 +78,11 @@
     ShelfLayoutManager* shelf)
     : shelf_(shelf),
       in_mouse_drag_(false) {
-  Shell::GetInstance()->AddRootWindowEventFilter(this);
+  Shell::GetInstance()->AddEnvEventFilter(this);
 }
 
 ShelfLayoutManager::AutoHideEventFilter::~AutoHideEventFilter() {
-  Shell::GetInstance()->RemoveRootWindowEventFilter(this);
+  Shell::GetInstance()->RemoveEnvEventFilter(this);
 }
 
 bool ShelfLayoutManager::AutoHideEventFilter::PreHandleKeyEvent(