Make WindowTree::SetModal() take the type.

services/ui/ws/server_window.h

 // Copyright 2014 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.
 
 #ifndef SERVICES_UI_WS_SERVER_WINDOW_H_
 #define SERVICES_UI_WS_SERVER_WINDOW_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 113 matching lines @@
   // Transient window management.
   // Adding transient child fails if the child window is modal to system.
   bool AddTransientWindow(ServerWindow* child);
   void RemoveTransientWindow(ServerWindow* child);
 
   ServerWindow* transient_parent() { return transient_parent_; }
   const ServerWindow* transient_parent() const { return transient_parent_; }
 
   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;
 
   // Returns the visibility requested by this window. IsDrawn() returns whether
   // the window is actually visible on screen.
   bool visible() const { return visible_; }
   void SetVisible(bool value);
 
   float opacity() const { return opacity_; }
@@ skipping 84 matching lines @@
   ServerWindow* parent_;
   Windows children_;
 
   // Transient window management.
   // If non-null we're actively restacking transient as the result of a
   // transient ancestor changing.
   ServerWindow* stacking_target_;
   ServerWindow* transient_parent_;
   Windows transient_children_;
 
-  bool is_modal_;
+  ModalType modal_type_;
   bool visible_;
   gfx::Rect bounds_;
   gfx::Insets client_area_;
   std::vector<gfx::Rect> additional_client_areas_;
   std::unique_ptr<ServerWindowCompositorFrameSinkManager>
       compositor_frame_sink_manager_;
   mojom::Cursor cursor_id_;
   mojom::Cursor non_client_cursor_id_;
   float opacity_;
   bool can_focus_;
@@ skipping 20 matching lines @@
 
   base::ObserverList<ServerWindowObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ServerWindow);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_SERVER_WINDOW_H_