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

Side by Side Diff: ash/shell.cc

Issue 2625733003: Re-reland: chromeos: Fix shelf appearing at login screen under mash (Closed)
Patch Set: remove include Created 3 years, 11 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/shell.h" 5 #include "ash/shell.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 contains, insets)) { 265 contains, insets)) {
266 return; 266 return;
267 } 267 }
268 } 268 }
269 269
270 void Shell::OnLoginStateChanged(LoginStatus status) { 270 void Shell::OnLoginStateChanged(LoginStatus status) {
271 for (auto& observer : *wm_shell_->shell_observers()) 271 for (auto& observer : *wm_shell_->shell_observers())
272 observer.OnLoginStateChanged(status); 272 observer.OnLoginStateChanged(status);
273 } 273 }
274 274
275 void Shell::OnLoginUserProfilePrepared() {
276 wm_shell_->CreateShelf();
277 CreateKeyboard();
278 }
279
280 void Shell::OnAppTerminating() { 275 void Shell::OnAppTerminating() {
281 for (auto& observer : *wm_shell_->shell_observers()) 276 for (auto& observer : *wm_shell_->shell_observers())
282 observer.OnAppTerminating(); 277 observer.OnAppTerminating();
283 } 278 }
284 279
285 void Shell::OnLockStateChanged(bool locked) { 280 void Shell::OnLockStateChanged(bool locked) {
286 for (auto& observer : *wm_shell_->shell_observers()) 281 for (auto& observer : *wm_shell_->shell_observers())
287 observer.OnLockStateChanged(locked); 282 observer.OnLockStateChanged(locked);
288 #ifndef NDEBUG 283 #ifndef NDEBUG
289 // Make sure that there is no system modal in Lock layer when unlocked. 284 // Make sure that there is no system modal in Lock layer when unlocked.
(...skipping 563 matching lines...) Expand 10 before | Expand all | Expand 10 after
853 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { 848 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const {
854 return std::unique_ptr<ui::EventTargetIterator>(); 849 return std::unique_ptr<ui::EventTargetIterator>();
855 } 850 }
856 851
857 ui::EventTargeter* Shell::GetEventTargeter() { 852 ui::EventTargeter* Shell::GetEventTargeter() {
858 NOTREACHED(); 853 NOTREACHED();
859 return nullptr; 854 return nullptr;
860 } 855 }
861 856
862 } // namespace ash 857 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698