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

Side by Side Diff: ash/shell.cc

Issue 2573703003: chromeos: Fix shelf appearing at login screen under mash (Closed)
Patch Set: msw comments Created 4 years 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 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 contains, insets)) { 269 contains, insets)) {
270 return; 270 return;
271 } 271 }
272 } 272 }
273 273
274 void Shell::OnLoginStateChanged(LoginStatus status) { 274 void Shell::OnLoginStateChanged(LoginStatus status) {
275 for (auto& observer : *wm_shell_->shell_observers()) 275 for (auto& observer : *wm_shell_->shell_observers())
276 observer.OnLoginStateChanged(status); 276 observer.OnLoginStateChanged(status);
277 } 277 }
278 278
279 void Shell::OnLoginUserProfilePrepared() {
280 wm_shell_->CreateShelf();
281 CreateKeyboard();
282 }
283
284 void Shell::OnAppTerminating() { 279 void Shell::OnAppTerminating() {
285 for (auto& observer : *wm_shell_->shell_observers()) 280 for (auto& observer : *wm_shell_->shell_observers())
286 observer.OnAppTerminating(); 281 observer.OnAppTerminating();
287 } 282 }
288 283
289 void Shell::OnLockStateChanged(bool locked) { 284 void Shell::OnLockStateChanged(bool locked) {
290 for (auto& observer : *wm_shell_->shell_observers()) 285 for (auto& observer : *wm_shell_->shell_observers())
291 observer.OnLockStateChanged(locked); 286 observer.OnLockStateChanged(locked);
292 #ifndef NDEBUG 287 #ifndef NDEBUG
293 // 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 619 matching lines...) Expand 10 before | Expand all | Expand 10 after
913 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { 908 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const {
914 return std::unique_ptr<ui::EventTargetIterator>(); 909 return std::unique_ptr<ui::EventTargetIterator>();
915 } 910 }
916 911
917 ui::EventTargeter* Shell::GetEventTargeter() { 912 ui::EventTargeter* Shell::GetEventTargeter() {
918 NOTREACHED(); 913 NOTREACHED();
919 return nullptr; 914 return nullptr;
920 } 915 }
921 916
922 } // namespace ash 917 } // 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