Make WindowTree::SetModal() take the type.

ui/aura/mus/window_tree_client.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 "ui/aura/mus/window_tree_client.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 461 matching lines @@
 
 void WindowTreeClient::OnConnectionLost() {
   delegate_->OnLostConnection(this);
 }
 
 bool WindowTreeClient::HandleInternalPropertyChanged(WindowMus* window,
                                                      const void* key) {
   if (key != client::kModalKey)
     return false;
 
-  if (window->GetWindow()->GetProperty(client::kModalKey) ==
-      ui::MODAL_TYPE_NONE) {
-    // TODO: shouldn't early return, but explicitly tell server to turn off
-    // modality. http://crbug.com/660073.
-    return true;
-  }
-
   const uint32_t change_id =
       ScheduleInFlightChange(base::MakeUnique<InFlightSetModalChange>(window));

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

Don't you need to change InFlightSetModalChange to consider the type now? Please
add test coverage of this.

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

Done. There was a test for TYPE_MODAL_NONE to TYPE_MODAL_WINDOW change fail. I
also (1) added a test for TYPE_MODAL_WINDOW to TYPE_MODAL_NONE fail, (2) changed
the ModalTypeSuccess test to check for setting successfully to TYPE_MODAL_SYSTEM
and TYPE_MODAL_NONE.

-  // TODO: this is subtly different that explicitly specifying a type.
-  // http://crbug.com/660073.
-  tree_->SetModal(change_id, window->server_id());
+  tree_->SetModal(change_id, window->server_id(),
+                  window->GetWindow()->GetProperty(client::kModalKey));
   return true;
 }
 
 void WindowTreeClient::OnEmbedImpl(ui::mojom::WindowTree* window_tree,
                                    ClientSpecificId client_id,
                                    ui::mojom::WindowDataPtr root_data,
                                    int64_t display_id,
                                    Id focused_window_id,
                                    bool drawn) {
   // WARNING: this is only called if WindowTreeClient was created as the
@@ skipping 1324 matching lines @@
   return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>(
       this, capture_synchronizer_.get(), window));
 }
 
 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) {
   return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>(
       this, focus_synchronizer_.get(), window));
 }
 
 }  // namespace aura