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

Side by Side Diff: ash/shell.cc

Issue 2625733003: Re-reland: chromeos: Fix shelf appearing at login screen under mash (Closed)
Patch Set: rebase, fix conflict with sky 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 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 contains, insets)) { 266 contains, insets)) {
267 return; 267 return;
268 } 268 }
269 } 269 }
270 270
271 void Shell::OnLoginStateChanged(LoginStatus status) { 271 void Shell::OnLoginStateChanged(LoginStatus status) {
272 for (auto& observer : *wm_shell_->shell_observers()) 272 for (auto& observer : *wm_shell_->shell_observers())
273 observer.OnLoginStateChanged(status); 273 observer.OnLoginStateChanged(status);
274 } 274 }
275 275
276 void Shell::OnLoginUserProfilePrepared() {
277 wm_shell_->CreateShelf();
278 CreateKeyboard();
279 }
280
281 void Shell::OnAppTerminating() { 276 void Shell::OnAppTerminating() {
282 for (auto& observer : *wm_shell_->shell_observers()) 277 for (auto& observer : *wm_shell_->shell_observers())
283 observer.OnAppTerminating(); 278 observer.OnAppTerminating();
284 } 279 }
285 280
286 void Shell::OnLockStateChanged(bool locked) { 281 void Shell::OnLockStateChanged(bool locked) {
287 for (auto& observer : *wm_shell_->shell_observers()) 282 for (auto& observer : *wm_shell_->shell_observers())
288 observer.OnLockStateChanged(locked); 283 observer.OnLockStateChanged(locked);
289 #ifndef NDEBUG 284 #ifndef NDEBUG
290 // Make sure that there is no system modal in Lock layer when unlocked. 285 // Make sure that there is no system modal in Lock layer when unlocked.
(...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after
855 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { 850 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const {
856 return std::unique_ptr<ui::EventTargetIterator>(); 851 return std::unique_ptr<ui::EventTargetIterator>();
857 } 852 }
858 853
859 ui::EventTargeter* Shell::GetEventTargeter() { 854 ui::EventTargeter* Shell::GetEventTargeter() {
860 NOTREACHED(); 855 NOTREACHED();
861 return nullptr; 856 return nullptr;
862 } 857 }
863 858
864 } // namespace ash 859 } // 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