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

ui/aura/mus/in_flight_change.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/aura/mus/in_flight_change.h"
 
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/mus/capture_synchronizer.h"
+#include "ui/aura/mus/focus_synchronizer.h"
 #include "ui/aura/mus/window_mus.h"
 #include "ui/aura/mus/window_port_mus.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/window.h"
 #include "ui/base/ui_base_types.h"
 
 namespace aura {
 
 // InFlightChange -------------------------------------------------------------
 
@@ skipping 103 matching lines @@
 
 InFlightCaptureChange::~InFlightCaptureChange() {}
 
 void InFlightCaptureChange::Revert() {
   capture_synchronizer_->SetCaptureFromServer(revert_window());
 }
 
 // InFlightFocusChange --------------------------------------------------------
 
 InFlightFocusChange::InFlightFocusChange(WindowTreeClient* client,
+                                         FocusSynchronizer* focus_synchronizer,
                                          WindowMus* revert_value)
-    : InFlightWindowTreeClientChange(client, revert_value, ChangeType::FOCUS) {}
+    : InFlightWindowTreeClientChange(client, revert_value, ChangeType::FOCUS),
+      focus_synchronizer_(focus_synchronizer) {}
 
 InFlightFocusChange::~InFlightFocusChange() {}
 
 void InFlightFocusChange::Revert() {
-  client()->SetFocusFromServer(revert_window());
+  focus_synchronizer_->SetFocusFromServer(revert_window());
 }
 
 // InFlightPropertyChange -----------------------------------------------------
 
 InFlightPropertyChange::InFlightPropertyChange(
     WindowMus* window,
     const std::string& property_name,
     std::unique_ptr<std::vector<uint8_t>> revert_value)
     : InFlightChange(window, ChangeType::PROPERTY),
       property_name_(property_name),
@@ skipping 87 matching lines @@
 InFlightSetModalChange::~InFlightSetModalChange() {}
 
 void InFlightSetModalChange::SetRevertValueFrom(const InFlightChange& change) {}
 
 void InFlightSetModalChange::Revert() {
   // TODO: need to support more than just off. http://crbug.com/660073.
   window()->GetWindow()->SetProperty(client::kModalKey, ui::MODAL_TYPE_NONE);
 }
 
 }  // namespace aura