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

ui/aura/mus/in_flight_change.h

 // 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.
 
 #ifndef UI_AURA_MUS_IN_FLIGHT_CHANGE_H_
 #define UI_AURA_MUS_IN_FLIGHT_CHANGE_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 10 matching lines @@
 
 namespace mojom {
 enum class Cursor : int32_t;
 }
 
 }  // namespace ui
 
 namespace aura {
 
 class CaptureSynchronizer;
+class FocusSynchronizer;
 class WindowMus;
 class WindowTreeClient;
 
 enum class ChangeType {
   ADD_CHILD,
   ADD_TRANSIENT_WINDOW,
   BOUNDS,
   CAPTURE,
   DELETE_WINDOW,
   DRAG_LOOP,
@@ skipping 183 matching lines @@
   // InFlightChange:
   void Revert() override;
 
  private:
   CaptureSynchronizer* capture_synchronizer_;
   DISALLOW_COPY_AND_ASSIGN(InFlightCaptureChange);
 };
 
 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);
 };
 
 class InFlightPropertyChange : public InFlightChange {
  public:
   InFlightPropertyChange(WindowMus* window,
                          const std::string& property_name,
                          std::unique_ptr<std::vector<uint8_t>> revert_value);
   ~InFlightPropertyChange() override;
 
@@ skipping 67 matching lines @@
   void SetRevertValueFrom(const InFlightChange& change) override;
   void Revert() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InFlightSetModalChange);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_MUS_IN_FLIGHT_CHANGE_H_