Chromium Code Reviews| Index: ui/aura/mus/in_flight_change.cc |
| diff --git a/ui/aura/mus/in_flight_change.cc b/ui/aura/mus/in_flight_change.cc |
| index aa70fb0413afa783b66bb27ae6ce16f84ef4d65c..8b9c366370a6aa72e720627719b978e0b38e8ef0 100644 |
| --- a/ui/aura/mus/in_flight_change.cc |
| +++ b/ui/aura/mus/in_flight_change.cc |
| @@ -4,10 +4,12 @@ |
| #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 { |
| @@ -230,8 +232,7 @@ InFlightSetModalChange::~InFlightSetModalChange() {} |
| void InFlightSetModalChange::SetRevertValueFrom(const InFlightChange& change) {} |
| void InFlightSetModalChange::Revert() { |
| - // TODO: modality is stored in keys in aura. |
| - // WindowPrivate(window()).LocalUnsetModal(); |
| + window()->GetWindow()->SetProperty(client::kModalKey, ui::MODAL_TYPE_NONE); |
|
msw
2016/10/27 18:37:37
Sorry, I'm not sure how InFlightChange typically w
sky
2016/10/27 19:30:06
Currently mus modality is a an on/off (see the TOD
|
| } |
| } // namespace aura |