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

ui/views/mus/mus_client.cc

 // 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.
 
 #include "ui/views/mus/mus_client.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "services/service_manager/public/cpp/connection.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/ui/public/interfaces/event_matcher.mojom.h"
 #include "ui/aura/env.h"
 #include "ui/aura/mus/gpu_service.h"
 #include "ui/aura/mus/os_exchange_data_provider_mus.h"
 #include "ui/aura/mus/property_converter.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/clipboard_mus.h"
 #include "ui/views/mus/desktop_window_tree_host_mus.h"
 #include "ui/views/mus/screen_mus.h"
 #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:
   PropertyConverterImpl() {}
   ~PropertyConverterImpl() override {}
 
   // aura::PropertyConverter:
   bool ConvertPropertyForTransport(
       aura::Window* window,
       const void* key,
       std::string* transport_name,
@@ skipping 63 matching lines @@
   instance_ = this;
   property_converter_ = base::MakeUnique<PropertyConverterImpl>();
 
   wm_state_ = base::MakeUnique<wm::WMState>();
 
   gpu_service_ = aura::GpuService::Create(connector, std::move(io_task_runner));
   compositor_context_factory_ =
       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_);
 
   // TODO(sky): wire up PointerWatcherEventRouter.
 
   screen_ = base::MakeUnique<ScreenMus>(this);
   screen_->Init(connector);
 
   std::unique_ptr<ClipboardMus> clipboard = base::MakeUnique<ClipboardMus>();
@@ skipping 23 matching lines @@
                                        aura::Window* target) {
   // TODO(sky): wire up pointer events.
   NOTIMPLEMENTED();
 }
 
 void MusClient::OnWindowManagerFrameValuesChanged() {
   // TODO(sky): wire up to DesktopNativeWidgetAura.
   NOTIMPLEMENTED();
 }
 
-aura::client::FocusClient* MusClient::GetFocusClient() {
-  return focus_controller_.get();
-}
-
 aura::client::CaptureClient* MusClient::GetCaptureClient() {
   return wm::CaptureController::Get();
 }
 
 aura::PropertyConverter* MusClient::GetPropertyConverter() {
   return property_converter_.get();
 }
 
 gfx::Point MusClient::GetCursorScreenPoint() {
   return window_tree_client_->GetCursorScreenPoint();
@@ skipping 11 matching lines @@
       return root->GetTopWindowContainingPoint(relative_point);
   }
   return nullptr;
 }
 
 std::unique_ptr<OSExchangeData::Provider> MusClient::BuildProvider() {
   return base::MakeUnique<aura::OSExchangeDataProviderMus>();
 }
 
 }  // namespace views