Make WindowTree::SetModal() take the type.

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"
@@ skipping 213 matching lines @@
 
 void InFlightOpacityChange::SetRevertValueFrom(const InFlightChange& change) {
   revert_opacity_ =
       static_cast<const InFlightOpacityChange&>(change).revert_opacity_;
 }
 
 void InFlightOpacityChange::Revert() {
   window()->SetOpacityFromServer(revert_opacity_);
 }
 
-// InFlightSetModalChange ------------------------------------------------------
+// InFlightSetModalTypeChange
+// ------------------------------------------------------
 
-InFlightSetModalChange::InFlightSetModalChange(WindowMus* window)
-    : InFlightChange(window, ChangeType::SET_MODAL) {}
+InFlightSetModalTypeChange::InFlightSetModalTypeChange(
+    WindowMus* window,
+    ui::ModalType revert_value)
+    : InFlightChange(window, ChangeType::SET_MODAL),
+      revert_modal_type_(revert_value) {}
 
-InFlightSetModalChange::~InFlightSetModalChange() {}
+InFlightSetModalTypeChange::~InFlightSetModalTypeChange() {}
 
-void InFlightSetModalChange::SetRevertValueFrom(const InFlightChange& change) {}
+void InFlightSetModalTypeChange::SetRevertValueFrom(
+    const InFlightChange& change) {
+  revert_modal_type_ =
+      static_cast<const InFlightSetModalTypeChange&>(change).revert_modal_type_;
+}
 
-void InFlightSetModalChange::Revert() {
-  // TODO: need to support more than just off. http://crbug.com/660073.
-  window()->GetWindow()->SetProperty(client::kModalKey, ui::MODAL_TYPE_NONE);
+void InFlightSetModalTypeChange::Revert() {
+  window()->GetWindow()->SetProperty(client::kModalKey, revert_modal_type_);
 }
 
 }  // namespace aura