Update WindowTreeClientImpl OnWindowDestroying

components/mus/public/cpp/lib/window_tree_client.cc

 // Copyright 2014 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/public/cpp/window_tree_client.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 383 matching lines @@
   FOR_EACH_OBSERVER(WindowTreeClientObserver, observers_,
                     OnWindowTreeFocusChanged(focused, blurred));
 }
 
 void WindowTreeClient::AddWindow(Window* window) {
   DCHECK(windows_.find(server_id(window)) == windows_.end());
   windows_[server_id(window)] = window;
 }
 
 void WindowTreeClient::OnWindowDestroying(Window* window) {
-  // TODO(jonross): Also clear the focused window (crbug.com/611983)
   if (window == capture_window_) {
-    InFlightCaptureChange reset_change(this, nullptr);
-    ApplyServerChangeToExistingInFlightChange(reset_change);
-    // Normally just updating the queued changes is sufficient. However since
+    // Normally the queue updates itself upon window destruction. However since
     // |window| is being destroyed, it will not be possible to notify its
     // observers of the lost capture. Update local state now.
     LocalSetCapture(nullptr);
   }
+  // For |focused_window_| window destruction clears the entire focus state.
 }
 
 void WindowTreeClient::OnWindowDestroyed(Window* window) {
   windows_.erase(server_id(window));
 
   for (auto& entry : embedded_windows_) {
     auto it = entry.second.find(window);
     if (it != entry.second.end()) {
       entry.second.erase(it);
       break;
@@ skipping 672 matching lines @@
     Window* window,
     const gfx::Vector2d& offset,
     const gfx::Insets& hit_area) {
   if (window_manager_internal_client_) {
     window_manager_internal_client_->SetUnderlaySurfaceOffsetAndExtendedHitArea(
         server_id(window), offset.x(), offset.y(), hit_area);
   }
 }
 
 }  // namespace mus