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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

Issue 2108843002: kiosk: Fix OobeScreenWaiter get wrong current screen (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 | « chrome/browser/chromeos/login/kiosk_browsertest.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 (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 "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 5 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
(...skipping 582 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 new_screen) != std::end(kDimOverlayScreenIds); 593 new_screen) != std::end(kDimOverlayScreenIds);
594 if (!chrome::IsRunningInMash()) { 594 if (!chrome::IsRunningInMash()) {
595 ash::ScreenDimmer* screen_dimmer = ash::ScreenDimmer::GetForContainer( 595 ash::ScreenDimmer* screen_dimmer = ash::ScreenDimmer::GetForContainer(
596 ash::kShellWindowId_LockScreenContainersContainer); 596 ash::kShellWindowId_LockScreenContainersContainer);
597 screen_dimmer->set_at_bottom(true); 597 screen_dimmer->set_at_bottom(true);
598 screen_dimmer->SetDimming(should_dim); 598 screen_dimmer->SetDimming(should_dim);
599 } else { 599 } else {
600 NOTIMPLEMENTED(); 600 NOTIMPLEMENTED();
601 } 601 }
602 602
603 current_screen_ = new_screen;
603 FOR_EACH_OBSERVER(Observer, 604 FOR_EACH_OBSERVER(Observer,
604 observer_list_, 605 observer_list_,
605 OnCurrentScreenChanged(current_screen_, new_screen)); 606 OnCurrentScreenChanged(current_screen_, new_screen));
606 current_screen_ = new_screen;
607 } 607 }
608 608
609 } // namespace chromeos 609 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/kiosk_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698