Makes SetFocus() notify callback correctly on failure

components/mus/ws/window_tree.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/ws/window_tree.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 265 matching lines @@
     return false;
 
   Display* display = GetDisplay(window);
   if (window && (!display || !window->can_focus() || !window->IsDrawn()))
     return false;
 
   if (!access_policy_->CanSetFocus(window))
     return false;
 
   Operation op(this, window_server_, OperationType::SET_FOCUS);
-  window_server_->SetFocusedWindow(window);
-  return true;
+  return window_server_->SetFocusedWindow(window);
 }
 
 bool WindowTree::Embed(const ClientWindowId& window_id,
                        mojom::WindowTreeClientPtr client) {
   if (!client || !CanEmbed(window_id))
     return false;
   ServerWindow* window = GetWindowByClientId(window_id);
   PrepareForEmbed(window);
   // When embedding we don't know the user id of where the TreeClient came
   // from. Use an invalid id, which limits what the client is able to do.
@@ skipping 42 matching lines @@
   client_id_to_window_id_map_[waiting_for_top_level_window_info
                                   ->client_window_id] = window->id();
   window_id_to_client_id_map_[window->id()] =
       waiting_for_top_level_window_info->client_window_id;
   roots_.insert(window);
   const bool drawn = window->parent() && window->parent()->IsDrawn();
   client()->OnTopLevelCreated(client_change_id, WindowToWindowData(window),
                               drawn);
 }
 
+void WindowTree::AddActivationParent(const ClientWindowId& window_id) {
+  Display* host = GetDisplayForWindowManager();
+  if (!host)
+    return;
+  ServerWindow* window = GetWindowByClientId(window_id);
+  if (window)
+    host->AddActivationParent(window);
+}
+
 void WindowTree::OnChangeCompleted(uint32_t change_id, bool success) {
   client()->OnChangeCompleted(change_id, success);
 }
 
 void WindowTree::OnAccelerator(uint32_t accelerator_id,
                                const ui::Event& event) {
   DCHECK(window_manager_internal_);
   window_manager_internal_->OnAccelerator(accelerator_id,
                                           mojom::Event::From(event));
 }
@@ skipping 915 matching lines @@
       wms->event_dispatcher()->AddAccelerator(id, std::move(event_matcher));
   callback.Run(success);
 }
 
 void WindowTree::RemoveAccelerator(uint32_t id) {
   WindowManagerState* wms = GetWindowManagerStateForWindowManager();
   wms->event_dispatcher()->RemoveAccelerator(id);
 }
 
 void WindowTree::AddActivationParent(Id transport_window_id) {
-  Display* host = GetDisplayForWindowManager();
-  if (!host)
-    return;
-  ServerWindow* window =
-      GetWindowByClientId(ClientWindowId(transport_window_id));
-  if (window)
-    host->AddActivationParent(window);
+  AddActivationParent(ClientWindowId(transport_window_id));
 }
 
 void WindowTree::RemoveActivationParent(Id transport_window_id) {
   Display* host = GetDisplayForWindowManager();
   if (!host)
     return;
   ServerWindow* window =
       GetWindowByClientId(ClientWindowId(transport_window_id));
   if (window)
     host->RemoveActivationParent(window);
@@ skipping 71 matching lines @@
 }
 
 bool WindowTree::IsWindowRootOfAnotherTreeForAccessPolicy(
     const ServerWindow* window) const {
   WindowTree* tree = window_server_->GetTreeWithRoot(window);
   return tree && tree != this;
 }
 
 }  // namespace ws
 }  // namespace mus