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 "ash/mus/user_window_controller_impl.h" | 5 #include "ash/mus/user_window_controller_impl.h" |
6 | 6 |
7 #include "ash/common/shell_window_ids.h" | 7 #include "ash/common/shell_window_ids.h" |
8 #include "ash/mus/bridge/wm_window_mus.h" | 8 #include "ash/mus/bridge/wm_window_mus.h" |
9 #include "ash/mus/property_util.h" | 9 #include "ash/mus/property_util.h" |
10 #include "ash/mus/root_window_controller.h" | 10 #include "ash/mus/root_window_controller.h" |
11 #include "ash/public/interfaces/container.mojom.h" | 11 #include "ash/public/interfaces/container.mojom.h" |
12 #include "components/mus/public/cpp/property_type_converters.h" | |
13 #include "components/mus/public/cpp/window.h" | |
14 #include "components/mus/public/cpp/window_property.h" | |
15 #include "components/mus/public/cpp/window_tree_client.h" | |
16 #include "mojo/common/common_type_converters.h" | 12 #include "mojo/common/common_type_converters.h" |
| 13 #include "services/ui/public/cpp/property_type_converters.h" |
| 14 #include "services/ui/public/cpp/window.h" |
| 15 #include "services/ui/public/cpp/window_property.h" |
| 16 #include "services/ui/public/cpp/window_tree_client.h" |
17 #include "ui/resources/grit/ui_resources.h" | 17 #include "ui/resources/grit/ui_resources.h" |
18 | 18 |
19 MUS_DECLARE_WINDOW_PROPERTY_TYPE(uint32_t) | 19 MUS_DECLARE_WINDOW_PROPERTY_TYPE(uint32_t) |
20 | 20 |
21 namespace { | 21 namespace { |
22 | 22 |
23 // Key used for storing identifier sent to clients for windows. | 23 // Key used for storing identifier sent to clients for windows. |
24 MUS_DEFINE_LOCAL_WINDOW_PROPERTY_KEY(uint32_t, kUserWindowIdKey, 0u); | 24 MUS_DEFINE_LOCAL_WINDOW_PROPERTY_KEY(uint32_t, kUserWindowIdKey, 0u); |
25 | 25 |
26 } // namespace | 26 } // namespace |
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
199 } | 199 } |
200 | 200 |
201 void UserWindowControllerImpl::FocusUserWindow(uint32_t window_id) { | 201 void UserWindowControllerImpl::FocusUserWindow(uint32_t window_id) { |
202 ::mus::Window* window = GetUserWindowById(window_id); | 202 ::mus::Window* window = GetUserWindowById(window_id); |
203 if (window) | 203 if (window) |
204 window->SetFocus(); | 204 window->SetFocus(); |
205 } | 205 } |
206 | 206 |
207 } // namespace mus | 207 } // namespace mus |
208 } // namespace ash | 208 } // namespace ash |
OLD | NEW |