| 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 "components/mus/ws/window_tree.h" | 5 #include "components/mus/ws/window_tree.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 1115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1126 if (success) { | 1126 if (success) { |
| 1127 if (!state.is_null()) | 1127 if (!state.is_null()) |
| 1128 window->SetTextInputState(state.To<ui::TextInputState>()); | 1128 window->SetTextInputState(state.To<ui::TextInputState>()); |
| 1129 | 1129 |
| 1130 Display* display = GetDisplay(window); | 1130 Display* display = GetDisplay(window); |
| 1131 if (display) | 1131 if (display) |
| 1132 display->SetImeVisibility(window, visible); | 1132 display->SetImeVisibility(window, visible); |
| 1133 } | 1133 } |
| 1134 } | 1134 } |
| 1135 | 1135 |
| 1136 void WindowTree::OnWindowInputEventAck(uint32_t event_id) { | 1136 void WindowTree::OnWindowInputEventAck(uint32_t event_id, bool handled) { |
| 1137 if (event_ack_id_ == 0 || event_id != event_ack_id_) { | 1137 if (event_ack_id_ == 0 || event_id != event_ack_id_) { |
| 1138 // TODO(sad): Something bad happened. Kill the client? | 1138 // TODO(sad): Something bad happened. Kill the client? |
| 1139 NOTIMPLEMENTED() << "Wrong event acked."; | 1139 NOTIMPLEMENTED() << "Wrong event acked."; |
| 1140 } | 1140 } |
| 1141 event_ack_id_ = 0; | 1141 event_ack_id_ = 0; |
| 1142 | 1142 |
| 1143 Display* event_source_display = event_source_display_; | 1143 Display* event_source_display = event_source_display_; |
| 1144 event_source_display_ = nullptr; | 1144 event_source_display_ = nullptr; |
| 1145 if (event_source_display) | 1145 if (event_source_display) |
| 1146 event_source_display->OnEventAck(this); | 1146 event_source_display->OnEventAck(this); |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1358 | 1358 |
| 1359 for (const auto* root : roots_) { | 1359 for (const auto* root : roots_) { |
| 1360 if (root->Contains(window)) | 1360 if (root->Contains(window)) |
| 1361 return true; | 1361 return true; |
| 1362 } | 1362 } |
| 1363 return false; | 1363 return false; |
| 1364 } | 1364 } |
| 1365 | 1365 |
| 1366 } // namespace ws | 1366 } // namespace ws |
| 1367 } // namespace mus | 1367 } // namespace mus |
| OLD | NEW |