aura/ash split: Moves RootWindowEventFilter and InputMethodEventFilter to ui/aura/.

All of InputMethodEventFilter and more than half of
RootWindowEventFilter were copied verbatim to a
DesktopRootWindowEventFilter. Instead of copying the other half for
another patch, I'm just moving RWEF and deleting the desktop version.

(InputMethodEventFilterUnittest was simple enough to move with the
file, but RootWindowEventFilter seems to act more like an integraiton
test of a lot of the stuff on Shell.)

BUG=125106

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137175 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 11 insertions, 5 deletions

diff --git a/ash/wm/workspace/multi_window_resize_controller.cc b/ash/wm/workspace/multi_window_resize_controller.cc
index cde8b66..59f8eca 100644
--- a/ash/wm/workspace/multi_window_resize_controller.cc
+++ b/ash/wm/workspace/multi_window_resize_controller.cc
@@ -6,13 +6,13 @@
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
-#include "ash/wm/root_window_event_filter.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/workspace/workspace_event_filter.h"
 #include "ash/wm/workspace/workspace_window_resizer.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/event_filter.h"
 #include "ui/aura/root_window.h"
+#include "ui/aura/shared/root_window_event_filter.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/hit_test.h"
@@ -98,7 +98,8 @@ class MultiWindowResizeController::ResizeView : public views::View {
   virtual gfx::NativeCursor GetCursor(
       const views::MouseEvent& event) OVERRIDE {
     int component = (direction_ == LEFT_RIGHT) ? HTRIGHT : HTBOTTOM;
-    return RootWindowEventFilter::CursorForWindowComponent(component);
+    return aura::shared::RootWindowEventFilter::CursorForWindowComponent(
+        component);
   }
 
  private:
diff --git a/ash/wm/workspace/workspace_window_resizer.cc b/ash/wm/workspace/workspace_window_resizer.cc
index abf13d5..4982457 100644
--- a/ash/wm/workspace/workspace_window_resizer.cc
+++ b/ash/wm/workspace/workspace_window_resizer.cc
@@ -9,10 +9,10 @@
 
 #include "ash/shell.h"
 #include "ash/wm/property_util.h"
-#include "ash/wm/root_window_event_filter.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/phantom_window_controller.h"
 #include "ash/wm/workspace/snap_sizer.h"
+#include "ui/aura/shared/root_window_event_filter.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/hit_test.h"
diff --git a/ash/wm/workspace/workspace_window_resizer.h b/ash/wm/workspace/workspace_window_resizer.h
index 76c837c..717bb21 100644
--- a/ash/wm/workspace/workspace_window_resizer.h
+++ b/ash/wm/workspace/workspace_window_resizer.h
@@ -12,11 +12,16 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 
+namespace aura {
+namespace shared {
+class RootWindowEventFilter;
+}
+}
+
 namespace ash {
 namespace internal {
 
 class PhantomWindowController;
-class RootWindowEventFilter;
 class SnapSizer;
 
 // WindowResizer implementation for workspaces. This enforces that windows are
@@ -130,7 +135,7 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer {
   // Set to true once Drag() is invoked and the bounds of the window change.
   bool did_move_or_resize_;
 
-  internal::RootWindowEventFilter* root_filter_;
+  aura::shared::RootWindowEventFilter* root_filter_;
 
   // The initial size of each of the windows in |attached_windows_| along the
   // primary axis.