Converts focusmanager from delegate to observer

components/mus/ws/window_tree_host_impl.h

 // Copyright 2015 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.
 
 #ifndef COMPONENTS_MUS_WS_WINDOW_TREE_HOST_IMPL_H_
 #define COMPONENTS_MUS_WS_WINDOW_TREE_HOST_IMPL_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/mus/common/types.h"
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
 #include "components/mus/ws/display_manager.h"
 #include "components/mus/ws/event_dispatcher.h"
 #include "components/mus/ws/event_dispatcher_delegate.h"
-#include "components/mus/ws/focus_controller_delegate.h"
+#include "components/mus/ws/focus_controller_observer.h"
 #include "components/mus/ws/server_window.h"
 #include "components/mus/ws/server_window_observer.h"
 
 namespace mus {
 namespace ws {
 
 class ConnectionManager;
 class FocusController;
 class WindowTreeHostDelegate;
 class WindowTreeImpl;
 
 // WindowTreeHostImpl is an implementation of the WindowTreeHost interface.
 // It serves as a top level root window for a window. Its lifetime is managed by
 // ConnectionManager. If the connection to the client breaks or if the user
 // closes the associated window, then this object and related state will be
 // deleted.
 class WindowTreeHostImpl : public DisplayManagerDelegate,
                            public mojom::WindowTreeHost,
-                           public FocusControllerDelegate,
+                           public FocusControllerObserver,
                            public EventDispatcherDelegate,
                            public ServerWindowObserver {
  public:
   // TODO(fsamuel): All these parameters are just plumbing for creating
   // DisplayManagers. We should probably just store these common parameters
   // in the DisplayManagerFactory and pass them along on DisplayManager::Create.
   WindowTreeHostImpl(mojom::WindowTreeHostClientPtr client,
                      ConnectionManager* connection_manager,
                      mojo::ApplicationImpl* app_impl,
                      const scoped_refptr<GpuState>& gpu_state,
@@ skipping 56 matching lines @@
   // DisplayManagerDelegate:
   ServerWindow* GetRootWindow() override;
   void OnEvent(mojom::EventPtr event) override;
   void OnDisplayClosed() override;
   void OnViewportMetricsChanged(
       const mojom::ViewportMetrics& old_metrics,
       const mojom::ViewportMetrics& new_metrics) override;
   void OnTopLevelSurfaceChanged(cc::SurfaceId surface_id) override;
   void OnCompositorFrameDrawn() override;
 
-  // FocusControllerDelegate:
-  void OnFocusChanged(ServerWindow* old_focused_window,
+  // FocusControllerObserver:
+  void OnFocusChanged(FocusControllerChangeSource change_source,
+                      ServerWindow* old_focused_window,
                       ServerWindow* new_focused_window) override;
 
   // EventDispatcherDelegate:
   void OnAccelerator(uint32_t accelerator_id, mojom::EventPtr event) override;
   void SetFocusedWindowFromEventDispatcher(ServerWindow* window) override;
   ServerWindow* GetFocusedWindowForEventDispatcher() override;
   void DispatchInputEventToWindow(ServerWindow* target,
                                   bool in_nonclient_area,
                                   mojom::EventPtr event) override;
 
@@ skipping 13 matching lines @@
   // draws.
   std::set<ServerWindow*> windows_needing_frame_destruction_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeHostImpl);
 };
 
 }  // namespace ws
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_WINDOW_TREE_HOST_IMPL_H_