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

Unified Diff: services/ui/ws/server_window.cc

Issue 2710023007: Make WindowTree::SetModal() take the type. (Closed)
Patch Set: Fix compile error. Created 3 years, 10 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
Index: services/ui/ws/server_window.cc
diff --git a/services/ui/ws/server_window.cc b/services/ui/ws/server_window.cc
index 9c5bce01942d101a8c69460a44de9624c25a48cc..fbfb770e0a337c4dba9d6fdf2e514da84f163c56 100644
--- a/services/ui/ws/server_window.cc
+++ b/services/ui/ws/server_window.cc
@@ -30,7 +30,7 @@ ServerWindow::ServerWindow(ServerWindowDelegate* delegate,
parent_(nullptr),
stacking_target_(nullptr),
transient_parent_(nullptr),
- is_modal_(false),
+ modal_type_(MODAL_TYPE_NONE),
visible_(false),
// Default to POINTER as CURSOR_NULL doesn't change the cursor, it leaves
// the last non-null cursor.
@@ -268,8 +268,8 @@ void ServerWindow::RemoveTransientWindow(ServerWindow* child) {
observer.OnTransientWindowRemoved(this, child);
}
-void ServerWindow::SetModal() {
- is_modal_ = true;
+void ServerWindow::SetModal(ModalType modal_type) {
+ modal_type_ = modal_type;
}
bool ServerWindow::Contains(const ServerWindow* window) const {

Powered by Google App Engine
This is Rietveld 408576698