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 "mojo/services/window_manager/window_manager_app.h" | 5 #include "mojo/services/window_manager/window_manager_app.h" |
6 | 6 |
7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
8 #include "base/stl_util.h" | 8 #include "base/stl_util.h" |
9 #include "mojo/aura/aura_init.h" | 9 #include "mojo/aura/aura_init.h" |
| 10 #include "mojo/converters/input_events/input_events_type_converters.h" |
10 #include "mojo/public/cpp/application/application_connection.h" | 11 #include "mojo/public/cpp/application/application_connection.h" |
11 #include "mojo/public/cpp/application/application_impl.h" | 12 #include "mojo/public/cpp/application/application_impl.h" |
12 #include "mojo/public/interfaces/application/shell.mojom.h" | 13 #include "mojo/public/interfaces/application/shell.mojom.h" |
13 #include "mojo/services/public/cpp/input_events/input_events_type_converters.h" | |
14 #include "mojo/services/public/cpp/view_manager/view.h" | 14 #include "mojo/services/public/cpp/view_manager/view.h" |
15 #include "mojo/services/public/cpp/view_manager/view_manager.h" | 15 #include "mojo/services/public/cpp/view_manager/view_manager.h" |
16 #include "ui/aura/window.h" | 16 #include "ui/aura/window.h" |
17 #include "ui/aura/window_delegate.h" | 17 #include "ui/aura/window_delegate.h" |
18 #include "ui/aura/window_property.h" | 18 #include "ui/aura/window_property.h" |
19 #include "ui/base/hit_test.h" | 19 #include "ui/base/hit_test.h" |
20 #include "ui/wm/core/capture_controller.h" | 20 #include "ui/wm/core/capture_controller.h" |
21 #include "ui/wm/core/focus_controller.h" | 21 #include "ui/wm/core/focus_controller.h" |
22 #include "ui/wm/public/activation_client.h" | 22 #include "ui/wm/public/activation_client.h" |
23 | 23 |
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
340 } | 340 } |
341 view->RemoveObserver(this); | 341 view->RemoveObserver(this); |
342 DCHECK(it != view_id_to_window_map_.end()); | 342 DCHECK(it != view_id_to_window_map_.end()); |
343 // Delete before we remove from map as destruction may want to look up view | 343 // Delete before we remove from map as destruction may want to look up view |
344 // for window. | 344 // for window. |
345 delete it->second; | 345 delete it->second; |
346 view_id_to_window_map_.erase(it); | 346 view_id_to_window_map_.erase(it); |
347 } | 347 } |
348 | 348 |
349 } // namespace mojo | 349 } // namespace mojo |
OLD | NEW |