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

ui/aura/mus/in_flight_change.h

Index: ui/aura/mus/in_flight_change.h
diff --git a/ui/aura/mus/in_flight_change.h b/ui/aura/mus/in_flight_change.h
index eb8d8876feaa86d115ca934cdb679647b6475771..0808fe5e77d7de0d2ae46117d37d6158d6ecfd87 100644
--- a/ui/aura/mus/in_flight_change.h
+++ b/ui/aura/mus/in_flight_change.h
@@ -28,6 +28,7 @@
 namespace aura {
 
 class CaptureSynchronizer;
+class FocusSynchronizer;
 class WindowMus;
 class WindowTreeClient;
 
@@ -231,13 +232,17 @@
 
 class InFlightFocusChange : public InFlightWindowTreeClientChange {
  public:
-  InFlightFocusChange(WindowTreeClient* client, WindowMus* revert_value);
+  InFlightFocusChange(WindowTreeClient* client,
+                      FocusSynchronizer* focus_synchronizer,
+                      WindowMus* revert_value);
   ~InFlightFocusChange() override;
 
   // InFlightChange:
   void Revert() override;
 
  private:
+  FocusSynchronizer* focus_synchronizer_;
+
   DISALLOW_COPY_AND_ASSIGN(InFlightFocusChange);
 };