| 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_impl.h" | 5 #include "components/mus/ws/window_tree_impl.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 1120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1131 if (success) { | 1131 if (success) { |
| 1132 if (!state.is_null()) | 1132 if (!state.is_null()) |
| 1133 window->SetTextInputState(state.To<ui::TextInputState>()); | 1133 window->SetTextInputState(state.To<ui::TextInputState>()); |
| 1134 | 1134 |
| 1135 WindowTreeHostImpl* host = GetHost(window); | 1135 WindowTreeHostImpl* host = GetHost(window); |
| 1136 if (host) | 1136 if (host) |
| 1137 host->SetImeVisibility(window, visible); | 1137 host->SetImeVisibility(window, visible); |
| 1138 } | 1138 } |
| 1139 } | 1139 } |
| 1140 | 1140 |
| 1141 void WindowTreeImpl::OnWindowInputEventAck(uint32_t event_id) { | 1141 void WindowTreeImpl::OnWindowInputEventAck(uint32_t event_id, bool handled) { |
| 1142 if (event_ack_id_ == 0 || event_id != event_ack_id_) { | 1142 if (event_ack_id_ == 0 || event_id != event_ack_id_) { |
| 1143 // TODO(sad): Something bad happened. Kill the client? | 1143 // TODO(sad): Something bad happened. Kill the client? |
| 1144 NOTIMPLEMENTED() << "Wrong event acked."; | 1144 NOTIMPLEMENTED() << "Wrong event acked."; |
| 1145 } | 1145 } |
| 1146 event_ack_id_ = 0; | 1146 event_ack_id_ = 0; |
| 1147 | 1147 |
| 1148 WindowTreeHostImpl* event_source_host = event_source_host_; | 1148 WindowTreeHostImpl* event_source_host = event_source_host_; |
| 1149 event_source_host_ = nullptr; | 1149 event_source_host_ = nullptr; |
| 1150 if (event_source_host) | 1150 if (event_source_host) |
| 1151 event_source_host->OnEventAck(this); | 1151 event_source_host->OnEventAck(this); |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1365 | 1365 |
| 1366 for (const auto* root : roots_) { | 1366 for (const auto* root : roots_) { |
| 1367 if (root->Contains(window)) | 1367 if (root->Contains(window)) |
| 1368 return true; | 1368 return true; |
| 1369 } | 1369 } |
| 1370 return false; | 1370 return false; |
| 1371 } | 1371 } |
| 1372 | 1372 |
| 1373 } // namespace ws | 1373 } // namespace ws |
| 1374 } // namespace mus | 1374 } // namespace mus |
| OLD | NEW |