Make WindowTree::SetModal() take the type.

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 6a8b6d4fa88822da665a64156f066152b4c37f92..6068892e29a7399517c34660131bb9a14d8511d0 100644
--- a/ui/aura/mus/in_flight_change.h
+++ b/ui/aura/mus/in_flight_change.h
@@ -14,6 +14,7 @@
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "ui/aura/window_observer.h"
+#include "ui/base/ui_base_types.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace ui {
@@ -313,17 +314,20 @@ class InFlightOpacityChange : public InFlightChange {
   DISALLOW_COPY_AND_ASSIGN(InFlightOpacityChange);
 };
 
-class InFlightSetModalChange : public InFlightChange {
+class InFlightSetModalTypeChange : public InFlightChange {
  public:
-  explicit InFlightSetModalChange(WindowMus* window);
-  ~InFlightSetModalChange() override;
+  explicit InFlightSetModalTypeChange(WindowMus* window,

[sky, 2017/03/06 22:26:45]

no explicit

+                                      ui::ModalType revert_value);
+  ~InFlightSetModalTypeChange() override;
 
   // InFlightChange:
   void SetRevertValueFrom(const InFlightChange& change) override;
   void Revert() override;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(InFlightSetModalChange);
+  ui::ModalType revert_modal_type_;
+
+  DISALLOW_COPY_AND_ASSIGN(InFlightSetModalTypeChange);
 };
 
 }  // namespace aura