Wires up modality for aura-mus

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/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 -------------------------------------------------------------
 
 InFlightChange::InFlightChange(WindowMus* window, ChangeType type)
     : window_(window), change_type_(type) {}
 
 InFlightChange::~InFlightChange() {}
 
@@ skipping 202 matching lines @@
 // InFlightSetModalChange ------------------------------------------------------
 
 InFlightSetModalChange::InFlightSetModalChange(WindowMus* window)
     : InFlightChange(window, ChangeType::SET_MODAL) {}
 
 InFlightSetModalChange::~InFlightSetModalChange() {}
 
 void InFlightSetModalChange::SetRevertValueFrom(const InFlightChange& change) {}
 
 void InFlightSetModalChange::Revert() {
-  // TODO: modality is stored in keys in aura.
-  // WindowPrivate(window()).LocalUnsetModal();
+  // TODO: need to support more than just off. http://crbug.com/660073.
+  window()->GetWindow()->SetProperty(client::kModalKey, ui::MODAL_TYPE_NONE);
 }
 
 }  // namespace aura