Revert of Improves focus/activation for aura-mus and DesktopNativeWidgetAura

ui/views/mus/mus_client.h

 // Copyright 2016 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 UI_VIEWS_MUS_MUS_CLIENT_INIT_H_
 #define UI_VIEWS_MUS_MUS_CLIENT_INIT_H_
 
 #include <string>
 
 #include "base/macros.h"
@@ skipping 14 matching lines @@
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace service_manager {
 class Connector;
 class Identity;
 }
 
 namespace wm {
+class FocusController;
 class WMState;
 }
 
 namespace views {
 
 class ScreenMus;
 class SurfaceContextFactory;
 
 namespace internal {
 class NativeWidgetDelegate;
@@ skipping 38 matching lines @@
       const service_manager::Identity& identity,
       scoped_refptr<base::SingleThreadTaskRunner> io_task_runner = nullptr);
 
   // aura::WindowTreeClientDelegate:
   void OnEmbed(
       std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override;
   void OnLostConnection(aura::WindowTreeClient* client) override;
   void OnEmbedRootDestroyed(aura::Window* root) override;
   void OnPointerEventObserved(const ui::PointerEvent& event,
                               aura::Window* target) override;
+  aura::client::FocusClient* GetFocusClient() override;
   aura::client::CaptureClient* GetCaptureClient() override;
   aura::PropertyConverter* GetPropertyConverter() override;
 
   // ScreenMusDelegate:
   void OnWindowManagerFrameValuesChanged() override;
   gfx::Point GetCursorScreenPoint() override;
   aura::Window* GetWindowAtScreenPoint(const gfx::Point& point) override;
 
   // ui:OSExchangeDataProviderFactory::Factory:
   std::unique_ptr<OSExchangeData::Provider> BuildProvider() override;
 
   static MusClient* instance_;
 
   service_manager::Connector* connector_;
   service_manager::Identity identity_;
 
   std::unique_ptr<wm::WMState> wm_state_;
 
   std::unique_ptr<ScreenMus> screen_;
 
+  std::unique_ptr<wm::FocusController> focus_controller_;
+
   std::unique_ptr<aura::PropertyConverter> property_converter_;
 
   std::unique_ptr<aura::WindowTreeClient> window_tree_client_;
 
   std::unique_ptr<aura::GpuService> gpu_service_;
 
   std::unique_ptr<SurfaceContextFactory> compositor_context_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MusClient);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_MUS_MUS_CLIENT_INIT_H_