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

Side by Side Diff: chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.cc

Issue 647043004: WizardScreen is merged to BaseScreen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Created 6 years, 2 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/chromeos/login/screens/kiosk_autolaunch_screen.h" 5 #include "chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "chrome/browser/chromeos/customization_document.h" 8 #include "chrome/browser/chromeos/customization_document.h"
9 #include "chrome/browser/chromeos/login/screens/screen_observer.h" 9 #include "chrome/browser/chromeos/login/screens/screen_observer.h"
10 #include "chrome/browser/chromeos/login/wizard_controller.h" 10 #include "chrome/browser/chromeos/login/wizard_controller.h"
11 11
12 namespace chromeos { 12 namespace chromeos {
13 13
14 KioskAutolaunchScreen::KioskAutolaunchScreen(ScreenObserver* observer, 14 KioskAutolaunchScreen::KioskAutolaunchScreen(ScreenObserver* observer,
15 KioskAutolaunchScreenActor* actor) 15 KioskAutolaunchScreenActor* actor)
16 : WizardScreen(observer), actor_(actor) { 16 : BaseScreen(observer), actor_(actor) {
17 DCHECK(actor_); 17 DCHECK(actor_);
18 if (actor_) 18 if (actor_)
19 actor_->SetDelegate(this); 19 actor_->SetDelegate(this);
20 } 20 }
21 21
22 KioskAutolaunchScreen::~KioskAutolaunchScreen() { 22 KioskAutolaunchScreen::~KioskAutolaunchScreen() {
23 if (actor_) 23 if (actor_)
24 actor_->SetDelegate(NULL); 24 actor_->SetDelegate(NULL);
25 } 25 }
26 26
(...skipping 12 matching lines...) Expand all
39 ScreenObserver::KIOSK_AUTOLAUNCH_CANCELED); 39 ScreenObserver::KIOSK_AUTOLAUNCH_CANCELED);
40 } 40 }
41 41
42 void KioskAutolaunchScreen::OnActorDestroyed( 42 void KioskAutolaunchScreen::OnActorDestroyed(
43 KioskAutolaunchScreenActor* actor) { 43 KioskAutolaunchScreenActor* actor) {
44 if (actor_ == actor) 44 if (actor_ == actor)
45 actor_ = NULL; 45 actor_ = NULL;
46 } 46 }
47 47
48 } // namespace chromeos 48 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698