Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(152)

Side by Side Diff: mash/wm/window_manager.cc

Issue 1980593002: Changes container names and adds a couple of more (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: change include Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « mash/wm/user_window_controller_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
OLDNEW
« no previous file with comments | « mash/wm/user_window_controller_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698