Revert of mus: Enable system modal windows

components/mus/ws/window_manager_state.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 "components/mus/ws/window_manager_state.h"
 
 #include "base/memory/weak_ptr.h"
 #include "components/mus/ws/accelerator.h"
 #include "components/mus/ws/display_manager.h"
 #include "components/mus/ws/platform_display.h"
@@ skipping 109 matching lines @@
   // so that all other EventDispatchers are updated.
   DCHECK(IsActive());
   if (capture_window() == window)
     return true;
   DCHECK(!window || root_->Contains(window));
   return event_dispatcher_.SetCaptureWindow(window, in_nonclient_area);
 }
 
 void WindowManagerState::ReleaseCaptureBlockedByModalWindow(
     const ServerWindow* modal_window) {
-  event_dispatcher_.ReleaseCaptureBlockedByModalWindow(modal_window);
+  if (!capture_window() || !modal_window->is_modal() ||
+      !modal_window->IsDrawn())
+    return;
+
+  if (modal_window->transient_parent() &&
+      !modal_window->transient_parent()->Contains(capture_window())) {
+    return;
+  }
+
+  SetCapture(nullptr, false);
 }
 
 void WindowManagerState::ReleaseCaptureBlockedByAnyModalWindow() {
-  event_dispatcher_.ReleaseCaptureBlockedByAnyModalWindow();
-}
+  if (!capture_window() || !capture_window()->IsBlockedByModalWindow())
+    return;
 
-void WindowManagerState::AddSystemModalWindow(ServerWindow* window) {
-  DCHECK(!window->transient_parent());
-  event_dispatcher_.AddSystemModalWindow(window);
+  SetCapture(nullptr, false);
 }
 
 mojom::DisplayPtr WindowManagerState::ToMojomDisplay() const {
   mojom::DisplayPtr display_ptr = display_->ToMojomDisplay();
   // TODO(sky): set work area.
   display_ptr->work_area = display_ptr->bounds.Clone();
   display_ptr->frame_decoration_values = frame_decoration_values_.Clone();
   return display_ptr;
 }
 
@@ skipping 238 matching lines @@
                                  weak_accelerator);
 }
 
 void WindowManagerState::OnEventTargetNotFound(const ui::Event& event) {
   window_server()->SendToEventObservers(event, user_id_,
                                         nullptr /* ignore_tree */);
 }
 
 }  // namespace ws
 }  // namespace mus