Make WindowTree::SetModal() take the type.

services/ui/ws/server_window.h

Index: services/ui/ws/server_window.h
diff --git a/services/ui/ws/server_window.h b/services/ui/ws/server_window.h
index bab09d069bd47186f352f393b95857d915b2b040..77c0b115bf0ad2fbbbb7b318d506aac299f9eb00 100644
--- a/services/ui/ws/server_window.h
+++ b/services/ui/ws/server_window.h
@@ -131,8 +131,8 @@ class ServerWindow {
 
   const Windows& transient_children() const { return transient_children_; }
 
-  bool is_modal() const { return is_modal_; }
-  void SetModal();
+  bool is_modal() const { return modal_type_ != MODAL_TYPE_NONE; }
+  void SetModal(ModalType modal_type);

[sky, 2017/03/01 00:13:34]

SetModalType

[Hadi, 2017/03/06 20:07:05]

Done. Also changed WindowTree::SetModal() to WindowTree::SetModalType().

 
   // Returns true if this contains |window| or is |window|.
   bool Contains(const ServerWindow* window) const;
@@ -237,7 +237,7 @@ class ServerWindow {
   ServerWindow* transient_parent_;
   Windows transient_children_;
 
-  bool is_modal_;
+  ModalType modal_type_;
   bool visible_;
   gfx::Rect bounds_;
   gfx::Insets client_area_;