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

ui/views/mus/mus_client.cc

Index: ui/views/mus/mus_client.cc
diff --git a/ui/views/mus/mus_client.cc b/ui/views/mus/mus_client.cc
index 4add5a07cccb915d616d62c46cce58d9dd5861d7..6a3a9d5dde05a8713ef19d54a293c3cef35bc88a 100644
--- a/ui/views/mus/mus_client.cc
+++ b/ui/views/mus/mus_client.cc
@@ -24,29 +24,11 @@
 #include "ui/views/mus/surface_context_factory.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
-#include "ui/wm/core/base_focus_rules.h"
 #include "ui/wm/core/capture_controller.h"
-#include "ui/wm/core/focus_controller.h"
 #include "ui/wm/core/wm_state.h"
 
 namespace views {
 namespace {
-
-// TODO: this is temporary, figure out what the real one should be like.
-class FocusRulesMus : public wm::BaseFocusRules {
- public:
-  FocusRulesMus() {}
-  ~FocusRulesMus() override {}
-
-  // wm::BaseFocusRules::
-  bool SupportsChildActivation(aura::Window* window) const override {
-    NOTIMPLEMENTED();
-    return true;
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(FocusRulesMus);
-};
 
 class PropertyConverterImpl : public aura::PropertyConverter {
  public:
@@ -131,8 +113,6 @@
       base::MakeUnique<views::SurfaceContextFactory>(gpu_service_.get());
   aura::Env::GetInstance()->set_context_factory(
       compositor_context_factory_.get());
-  // TODO(sky): need a class similar to DesktopFocusRules.
-  focus_controller_ = base::MakeUnique<wm::FocusController>(new FocusRulesMus);
   window_tree_client_ =
       base::MakeUnique<aura::WindowTreeClient>(this, nullptr, nullptr);
   window_tree_client_->ConnectViaWindowTreeFactory(connector_);
@@ -176,10 +156,6 @@
   NOTIMPLEMENTED();
 }
 
-aura::client::FocusClient* MusClient::GetFocusClient() {
-  return focus_controller_.get();
-}
-
 aura::client::CaptureClient* MusClient::GetCaptureClient() {
   return wm::CaptureController::Get();
 }