Reland: Remove aura and make a pure mojo::View version of FocusController.

mojo/services/window_manager/BUILD.gn

Index: mojo/services/window_manager/BUILD.gn
diff --git a/mojo/services/window_manager/BUILD.gn b/mojo/services/window_manager/BUILD.gn
index 751c97c3cfc099338b50cb40cc1ee11c78221311..2ae22195b0d9770c62babeca4f142b262ad23e47 100644
--- a/mojo/services/window_manager/BUILD.gn
+++ b/mojo/services/window_manager/BUILD.gn
@@ -4,8 +4,6 @@
 
 import("//build/config/ui.gni")
 
-if (use_aura) {
-
 # GYP version: mojo/mojo_services.gypi:mojo_core_window_manager
 shared_library("window_manager") {
   sources = [ "main.cc" ]
@@ -25,6 +23,12 @@ shared_library("window_manager") {
 # GYP version: mojo/mojo_services.gypi:mojo_core_window_manager_lib
 source_set("lib") {
   sources = [
+    "basic_focus_rules.cc",
+    "basic_focus_rules.h",
+    "focus_controller.cc",
+    "focus_controller.h",
+    "focus_controller_observer.h",
+    "focus_rules.h",
     "native_viewport_event_dispatcher_impl.cc",
     "native_viewport_event_dispatcher_impl.h",
     "window_manager_app.cc",
@@ -32,10 +36,12 @@ source_set("lib") {
     "window_manager_delegate.h",
     "window_manager_impl.cc",
     "window_manager_impl.h",
-  ]
-
-  public_deps = [
-    "//mojo/aura",
+    "view_event_dispatcher.cc",
+    "view_event_dispatcher.h",
+    "view_target.cc",
+    "view_target.h",
+    "view_targeter.cc",
+    "view_targeter.h",
   ]
 
   deps = [
@@ -43,8 +49,6 @@ source_set("lib") {
     "//ui/base",
     "//ui/gfx",
     "//ui/gfx/geometry",
-    "//ui/wm",
-    "//mojo/aura",
     "//mojo/application",
     "//mojo/common",
     "//mojo/converters/input_events",
@@ -79,5 +83,3 @@ test("window_manager_unittests") {
     deps += [ "//ui/gfx/x" ]
   }
 }
-
-}  # use_aura