views/mus: Fix window activation.

ui/views/mus/native_widget_mus.cc

 // 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.
 
 #include "ui/views/mus/native_widget_mus.h"
 
 #include "base/macros.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window.h"
@@ skipping 32 matching lines @@
 
 DECLARE_WINDOW_PROPERTY_TYPE(mus::Window*);
 
 namespace views {
 namespace {
 
 DEFINE_WINDOW_PROPERTY_KEY(mus::Window*, kMusWindow, nullptr);
 
 MUS_DEFINE_WINDOW_PROPERTY_KEY(NativeWidgetMus*, kNativeWidgetMusKey, nullptr);
 
-// TODO: figure out what this should be.
+// This ensures that only the top-level aura Window can be activated.
 class FocusRulesImpl : public wm::BaseFocusRules {
  public:
-  FocusRulesImpl() {}
+  explicit FocusRulesImpl(aura::Window* root) : root_(root) {}
   ~FocusRulesImpl() override {}
 
   bool SupportsChildActivation(aura::Window* window) const override {
-    return true;
+    return root_ == window;
   }
 
  private:
+  aura::Window* root_;
+
   DISALLOW_COPY_AND_ASSIGN(FocusRulesImpl);
 };
 
 class ContentWindowLayoutManager : public aura::LayoutManager {
  public:
    ContentWindowLayoutManager(aura::Window* outer, aura::Window* inner)
       : outer_(outer), inner_(inner) {}
    ~ContentWindowLayoutManager() override {}
 
  private:
@@ skipping 484 matching lines @@
   NativeWidgetAura::RegisterNativeWidgetForWindow(this, content_);
 
   ownership_ = params.ownership;
   window_->SetCanFocus(params.activatable ==
                        Widget::InitParams::ACTIVATABLE_YES);
 
   window_tree_host_->AddObserver(this);
   window_tree_host_->InitHost();
   window_tree_host_->window()->SetProperty(kMusWindow, window_);
 
-  focus_client_.reset(new wm::FocusController(new FocusRulesImpl));
+  focus_client_.reset(
+      new wm::FocusController(new FocusRulesImpl(window_tree_host_->window())));
 
   aura::client::SetFocusClient(window_tree_host_->window(),
                                focus_client_.get());
   aura::client::SetActivationClient(window_tree_host_->window(),
                                     focus_client_.get());
   screen_position_client_.reset(new ScreenPositionClientMus(window_));
   aura::client::SetScreenPositionClient(window_tree_host_->window(),
                                         screen_position_client_.get());
 
   // TODO(erg): Remove this check when mash/wm/frame/move_event_handler.cc's
@@ skipping 433 matching lines @@
   return true;
 }
 
 void NativeWidgetMus::ClearNativeFocus() {
   if (!IsActive())
     return;
   mus::Window* focused =
       window_ ? window_->connection()->GetFocusedWindow() : nullptr;
   if (focused && window_->Contains(focused) && focused != window_)
     window_->SetFocus();
+  // Move aura-focus back to |content_|, so that the Widget still receives
+  // events correctly.
+  aura::client::GetFocusClient(content_)->ResetFocusWithinActiveWindow(
+      content_);
 }
 
 gfx::Rect NativeWidgetMus::GetWorkAreaBoundsInScreen() const {
   // NOTIMPLEMENTED();
   return gfx::Rect();
 }
 
 Widget::MoveLoopResult NativeWidgetMus::RunMoveLoop(
     const gfx::Vector2d& drag_offset,
     Widget::MoveLoopSource source,
@@ skipping 191 matching lines @@
     GetNativeWindow()->Show();
   } else {
     window_tree_host_->Hide();
     window_->SetVisible(false);
     GetNativeWindow()->Hide();
   }
   native_widget_delegate_->OnNativeWidgetVisibilityChanged(window->visible());
 }
 
 }  // namespace views