| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <stdint.h> | 5 #include <stdint.h> |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 #include "components/mus/ws/server_window.h" | 23 #include "components/mus/ws/server_window.h" |
| 24 #include "components/mus/ws/server_window_surface_manager_test_api.h" | 24 #include "components/mus/ws/server_window_surface_manager_test_api.h" |
| 25 #include "components/mus/ws/test_change_tracker.h" | 25 #include "components/mus/ws/test_change_tracker.h" |
| 26 #include "components/mus/ws/test_utils.h" | 26 #include "components/mus/ws/test_utils.h" |
| 27 #include "components/mus/ws/window_manager_access_policy.h" | 27 #include "components/mus/ws/window_manager_access_policy.h" |
| 28 #include "components/mus/ws/window_server.h" | 28 #include "components/mus/ws/window_server.h" |
| 29 #include "components/mus/ws/window_server_delegate.h" | 29 #include "components/mus/ws/window_server_delegate.h" |
| 30 #include "components/mus/ws/window_tree.h" | 30 #include "components/mus/ws/window_tree.h" |
| 31 #include "components/mus/ws/window_tree_binding.h" | 31 #include "components/mus/ws/window_tree_binding.h" |
| 32 #include "mojo/converters/geometry/geometry_type_converters.h" | 32 #include "mojo/converters/geometry/geometry_type_converters.h" |
| 33 #include "mojo/services/network/public/interfaces/url_loader.mojom.h" | |
| 34 #include "mojo/shell/public/interfaces/connector.mojom.h" | 33 #include "mojo/shell/public/interfaces/connector.mojom.h" |
| 35 #include "testing/gtest/include/gtest/gtest.h" | 34 #include "testing/gtest/include/gtest/gtest.h" |
| 36 #include "ui/events/event.h" | 35 #include "ui/events/event.h" |
| 37 #include "ui/events/event_utils.h" | 36 #include "ui/events/event_utils.h" |
| 38 #include "ui/gfx/geometry/rect.h" | 37 #include "ui/gfx/geometry/rect.h" |
| 39 | 38 |
| 40 namespace mus { | 39 namespace mus { |
| 41 namespace ws { | 40 namespace ws { |
| 42 namespace test { | 41 namespace test { |
| 43 namespace { | 42 namespace { |
| (...skipping 792 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 836 | 835 |
| 837 // Make |w3| child of |w1|. This should release capture as |w3| is now blocked | 836 // Make |w3| child of |w1|. This should release capture as |w3| is now blocked |
| 838 // by a modal window. | 837 // by a modal window. |
| 839 ASSERT_TRUE(tree->AddWindow(w1_id, w3_id)); | 838 ASSERT_TRUE(tree->AddWindow(w1_id, w3_id)); |
| 840 EXPECT_EQ(nullptr, GetCaptureWindow(display)); | 839 EXPECT_EQ(nullptr, GetCaptureWindow(display)); |
| 841 } | 840 } |
| 842 | 841 |
| 843 } // namespace test | 842 } // namespace test |
| 844 } // namespace ws | 843 } // namespace ws |
| 845 } // namespace mus | 844 } // namespace mus |
| OLD | NEW |