Converts focusmanager from delegate to observer

components/mus/ws/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 import("//mojo/public/mojo_application.gni")
 
 source_set("lib") {
   sources = [
     "access_policy.h",
     "access_policy_delegate.h",
     "client_connection.cc",
     "client_connection.h",
     "connection_manager.cc",
     "connection_manager.h",
     "connection_manager_delegate.cc",
     "connection_manager_delegate.h",
     "default_access_policy.cc",
     "default_access_policy.h",
     "display_manager.cc",
     "display_manager.h",
     "display_manager_delegate.h",
     "display_manager_factory.h",
     "event_dispatcher.cc",
     "event_dispatcher.h",
     "event_dispatcher_delegate.h",
     "focus_controller.cc",
     "focus_controller.h",
-    "focus_controller_delegate.h",
+    "focus_controller_observer.h",
     "forwarding_window_manager.cc",
     "forwarding_window_manager.h",
     "operation.cc",
     "operation.h",
     "server_window.cc",
     "server_window.h",
     "server_window_delegate.h",
     "server_window_drawn_tracker.cc",
     "server_window_drawn_tracker.h",
     "server_window_drawn_tracker_observer.h",
@@ skipping 16 matching lines @@
     "window_tree_impl.cc",
     "window_tree_impl.h",
   ]
 
   deps = [
     "//base",
     "//cc",
     "//cc/surfaces",
     "//cc/surfaces:surface_id",
     "//components/mus/common",
-    "//components/mus/gles2:gles2",
+    "//components/mus/gles2",
     "//components/mus/public/interfaces",
     "//components/mus/surfaces",
     "//mojo/application/public/cpp",
     "//mojo/common:common_base",
     "//mojo/converters/geometry",
     "//mojo/converters/ime",
     "//mojo/converters/input_events",
     "//mojo/converters/surfaces",
     "//mojo/public/cpp/bindings:callback",
     "//mojo/services/tracing/public/cpp",
     "//ui/events",
     "//ui/events/platform",
     "//ui/gfx",
     "//ui/gfx/geometry",
-    "//ui/gl:gl",
+    "//ui/gl",
     "//ui/mojo/geometry:interfaces",
+    "//ui/platform_window",
     "//ui/platform_window:platform_impls",
-    "//ui/platform_window:platform_window",
   ]
 }
 
 source_set("test_support") {
   testonly = true
 
   sources = [
     "test_change_tracker.cc",
     "test_change_tracker.h",
   ]
@@ skipping 24 matching lines @@
     "focus_controller_unittest.cc",
     "server_window_drawn_tracker_unittest.cc",
     "test_server_window_delegate.cc",
     "test_server_window_delegate.h",
     "transient_windows_unittest.cc",
     "window_coordinate_conversions_unittest.cc",
     "window_tree_unittest.cc",
   ]
 
   deps = [
+    ":lib",
     ":test_support",
-    ":lib",
     "//base",
     "//base/test:test_config",
     "//components/mus/common",
-    "//components/mus/surfaces",
     "//components/mus/public/cpp",
     "//components/mus/public/interfaces",
+    "//components/mus/surfaces",
     "//mojo/application/public/interfaces",
     "//mojo/converters/geometry",
     "//mojo/converters/input_events",
     "//mojo/converters/transform",
     "//mojo/environment:chromium",
     "//mojo/gles2",
     "//mojo/platform_handle",
     "//mojo/public/cpp/bindings:bindings",
+    "//testing/gtest",
     "//third_party/mojo/src/mojo/edk/test:run_all_unittests",
-    "//ui/mojo/geometry:interfaces",
-    "//testing/gtest",
     "//ui/events",
     "//ui/gfx",
     "//ui/gfx:test_support",
     "//ui/gfx/geometry",
+    "//ui/mojo/geometry:interfaces",
   ]
 
   if (!is_android) {  # TODO(GYP) Enable on Android when osmesa links.
     deps += [ "//third_party/mesa:osmesa" ]
   }
 }
 
 mojo_native_application("apptests") {
   output_name = "mus_apptests"
   testonly = true
@@ skipping 17 matching lines @@
     "//ui/gfx:test_support",
     "//ui/gfx/geometry",
     "//ui/mojo/geometry:interfaces",
     "//ui/mojo/geometry:util",
   ]
 
   data_deps = [
     ":lib",
   ]
 }