Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(480)

Unified Diff: ui/aura/mus/in_flight_change.cc

Issue 2454973003: Wires up modality for aura-mus (Closed)
Patch Set: more tests Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/aura/mus/window_tree_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..5c2ade7872dd22cd3fd2fb5b058b80ee42a0cd7c 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,8 @@ 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
« no previous file with comments | « no previous file | ui/aura/mus/window_tree_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698