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 "mash/wm/window_manager.h" | 5 #include "mash/wm/window_manager.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
168 mus::Window* WindowManager::OnWmCreateTopLevelWindow( | 168 mus::Window* WindowManager::OnWmCreateTopLevelWindow( |
169 std::map<std::string, std::vector<uint8_t>>* properties) { | 169 std::map<std::string, std::vector<uint8_t>>* properties) { |
170 return NewTopLevelWindow(properties); | 170 return NewTopLevelWindow(properties); |
171 } | 171 } |
172 | 172 |
173 void WindowManager::OnAccelerator(uint32_t id, const ui::Event& event) { | 173 void WindowManager::OnAccelerator(uint32_t id, const ui::Event& event) { |
174 root_controller_->OnAccelerator(id, std::move(event)); | 174 root_controller_->OnAccelerator(id, std::move(event)); |
175 } | 175 } |
176 | 176 |
177 void WindowManager::ScreenlockStateChanged(bool locked) { | 177 void WindowManager::ScreenlockStateChanged(bool locked) { |
178 // Hide USER_PRIVATE windows when the screen is locked. | 178 // Hide USER_PRIVATE_CONTAINER windows when the screen is locked. |
179 mus::Window* window = root_controller_->GetWindowForContainer( | 179 mus::Window* window = root_controller_->GetWindowForContainer( |
180 mash::wm::mojom::Container::USER_PRIVATE); | 180 mash::wm::mojom::Container::USER_PRIVATE); |
181 window->SetVisible(!locked); | 181 window->SetVisible(!locked); |
182 } | 182 } |
183 | 183 |
184 } // namespace wm | 184 } // namespace wm |
185 } // namespace mash | 185 } // namespace mash |
OLD | NEW |