Make WindowTree::SetModal() take the type.

services/ui/ws/server_window.cc

 // 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.
 
 #include "services/ui/ws/server_window.h"
 
 #include <inttypes.h>
 #include <stddef.h>
 
 #include "base/memory/ptr_util.h"
@@ skipping 12 matching lines @@
 
 ServerWindow::ServerWindow(ServerWindowDelegate* delegate,
                            const WindowId& id,
                            const Properties& properties)
     : delegate_(delegate),
       id_(id),
       frame_sink_id_(WindowIdToTransportId(id), 0),
       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.
       cursor_id_(mojom::Cursor::POINTER),
       non_client_cursor_id_(mojom::Cursor::POINTER),
       opacity_(1),
       can_focus_(true),
       properties_(properties),
       // Don't notify newly added observers during notification. This causes
       // problems for code that adds an observer as part of an observer
@@ skipping 177 matching lines @@
   for (ServerWindow* child : children_) {
     ServerWindow* window = child->GetChildWindow(window_id);
     if (window)
       return window;
   }
 
   return nullptr;
 }
 
 bool ServerWindow::AddTransientWindow(ServerWindow* child) {
-  // A system modal window cannot become a transient child.
-  if (child->is_modal() && !child->transient_parent())

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

I am not sure if we should have retained this check or equivalent of this (i.e.
check if modal_type() == MODAL_TYPE_SYSTEM). Since we don't decide on system
modality based on not having transient parent anymore, I remove it.

-    return false;
-
   if (child->transient_parent())
     child->transient_parent()->RemoveTransientWindow(child);
 
   DCHECK(std::find(transient_children_.begin(), transient_children_.end(),
                    child) == transient_children_.end());
   transient_children_.push_back(child);
   child->transient_parent_ = this;
 
   // Restack |child| properly above its transient parent, if they share the same
   // parent.
@@ skipping 16 matching lines @@
   // If |child| and its former transient parent share the same parent, |child|
   // should be restacked properly so it is not among transient children of its
   // former parent, anymore.
   if (parent() == child->parent())
     RestackTransientDescendants(this, &GetStackingTarget, &ReorderImpl);
 
   for (auto& observer : observers_)
     observer.OnTransientWindowRemoved(this, child);
 }
 
-void ServerWindow::SetModal() {
-  is_modal_ = true;
+void ServerWindow::SetModalType(ModalType modal_type) {
+  modal_type_ = modal_type;
 }
 
 bool ServerWindow::Contains(const ServerWindow* window) const {
   for (const ServerWindow* parent = window; parent; parent = parent->parent_) {
     if (parent == this)
       return true;
   }
   return false;
 }
 
@@ skipping 189 matching lines @@
   window->OnStackingChanged();
 }
 
 // static
 ServerWindow** ServerWindow::GetStackingTarget(ServerWindow* window) {
   return &window->stacking_target_;
 }
 
 }  // namespace ws
 }  // namespace ui