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

Side by Side Diff: ash/shell.cc

Issue 2619943002: Revert "chromeos: Fix shelf appearing at login screen under mash" (Closed)
Patch Set: 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
« no previous file with comments | « ash/shell.h ('k') | chrome/browser/chromeos/login/session/chrome_session_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 contains, insets)) { 264 contains, insets)) {
265 return; 265 return;
266 } 266 }
267 } 267 }
268 268
269 void Shell::OnLoginStateChanged(LoginStatus status) { 269 void Shell::OnLoginStateChanged(LoginStatus status) {
270 for (auto& observer : *wm_shell_->shell_observers()) 270 for (auto& observer : *wm_shell_->shell_observers())
271 observer.OnLoginStateChanged(status); 271 observer.OnLoginStateChanged(status);
272 } 272 }
273 273
274 void Shell::OnLoginUserProfilePrepared() {
275 wm_shell_->CreateShelf();
276 CreateKeyboard();
277 }
278
274 void Shell::OnAppTerminating() { 279 void Shell::OnAppTerminating() {
275 for (auto& observer : *wm_shell_->shell_observers()) 280 for (auto& observer : *wm_shell_->shell_observers())
276 observer.OnAppTerminating(); 281 observer.OnAppTerminating();
277 } 282 }
278 283
279 void Shell::OnLockStateChanged(bool locked) { 284 void Shell::OnLockStateChanged(bool locked) {
280 for (auto& observer : *wm_shell_->shell_observers()) 285 for (auto& observer : *wm_shell_->shell_observers())
281 observer.OnLockStateChanged(locked); 286 observer.OnLockStateChanged(locked);
282 #ifndef NDEBUG 287 #ifndef NDEBUG
283 // Make sure that there is no system modal in Lock layer when unlocked. 288 // 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
847 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { 852 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const {
848 return std::unique_ptr<ui::EventTargetIterator>(); 853 return std::unique_ptr<ui::EventTargetIterator>();
849 } 854 }
850 855
851 ui::EventTargeter* Shell::GetEventTargeter() { 856 ui::EventTargeter* Shell::GetEventTargeter() {
852 NOTREACHED(); 857 NOTREACHED();
853 return nullptr; 858 return nullptr;
854 } 859 }
855 860
856 } // namespace ash 861 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.h ('k') | chrome/browser/chromeos/login/session/chrome_session_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698