| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "ui/aura/test/mus/test_window_tree.h" | 5 #include "ui/aura/test/mus/test_window_tree.h" |
| 6 | 6 |
| 7 #include "testing/gtest/include/gtest/gtest.h" | 7 #include "testing/gtest/include/gtest/gtest.h" |
| 8 | 8 |
| 9 namespace aura { | 9 namespace aura { |
| 10 | 10 |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 } | 174 } |
| 175 | 175 |
| 176 void TestWindowTree::RemoveWindowFromParent(uint32_t change_id, | 176 void TestWindowTree::RemoveWindowFromParent(uint32_t change_id, |
| 177 uint32_t window_id) { | 177 uint32_t window_id) { |
| 178 OnChangeReceived(change_id); | 178 OnChangeReceived(change_id); |
| 179 } | 179 } |
| 180 | 180 |
| 181 void TestWindowTree::AddTransientWindow(uint32_t change_id, | 181 void TestWindowTree::AddTransientWindow(uint32_t change_id, |
| 182 uint32_t window_id, | 182 uint32_t window_id, |
| 183 uint32_t transient_window_id) { | 183 uint32_t transient_window_id) { |
| 184 OnChangeReceived(change_id); | 184 transient_data_.parent_id = window_id; |
| 185 transient_data_.child_id = transient_window_id; |
| 186 OnChangeReceived(change_id, WindowTreeChangeType::ADD_TRANSIENT); |
| 185 } | 187 } |
| 186 | 188 |
| 187 void TestWindowTree::RemoveTransientWindowFromParent( | 189 void TestWindowTree::RemoveTransientWindowFromParent( |
| 188 uint32_t change_id, | 190 uint32_t change_id, |
| 189 uint32_t transient_window_id) { | 191 uint32_t transient_window_id) { |
| 190 OnChangeReceived(change_id); | 192 transient_data_.parent_id = kInvalidServerId; |
| 193 transient_data_.child_id = transient_window_id; |
| 194 OnChangeReceived(change_id, WindowTreeChangeType::REMOVE_TRANSIENT); |
| 191 } | 195 } |
| 192 | 196 |
| 193 void TestWindowTree::SetModal(uint32_t change_id, uint32_t window_id) { | 197 void TestWindowTree::SetModal(uint32_t change_id, uint32_t window_id) { |
| 194 OnChangeReceived(change_id, WindowTreeChangeType::MODAL); | 198 OnChangeReceived(change_id, WindowTreeChangeType::MODAL); |
| 195 } | 199 } |
| 196 | 200 |
| 197 void TestWindowTree::ReorderWindow(uint32_t change_id, | 201 void TestWindowTree::ReorderWindow(uint32_t change_id, |
| 198 uint32_t window_id, | 202 uint32_t window_id, |
| 199 uint32_t relative_window_id, | 203 uint32_t relative_window_id, |
| 200 ui::mojom::OrderDirection direction) { | 204 ui::mojom::OrderDirection direction) { |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 271 void TestWindowTree::PerformWindowMove(uint32_t change_id, | 275 void TestWindowTree::PerformWindowMove(uint32_t change_id, |
| 272 uint32_t window_id, | 276 uint32_t window_id, |
| 273 ui::mojom::MoveLoopSource source, | 277 ui::mojom::MoveLoopSource source, |
| 274 const gfx::Point& cursor_location) { | 278 const gfx::Point& cursor_location) { |
| 275 OnChangeReceived(change_id); | 279 OnChangeReceived(change_id); |
| 276 } | 280 } |
| 277 | 281 |
| 278 void TestWindowTree::CancelWindowMove(uint32_t window_id) {} | 282 void TestWindowTree::CancelWindowMove(uint32_t window_id) {} |
| 279 | 283 |
| 280 } // namespace aura | 284 } // namespace aura |
| OLD | NEW |