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

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

Issue 2700303002: cros: Unify oobe View/Actor naming to just View. (Closed)
Patch Set: Rebase Created 3 years, 10 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/customization_document.h" 8 #include "chrome/browser/chromeos/customization/customization_document.h"
9 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h" 9 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.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( 14 KioskAutolaunchScreen::KioskAutolaunchScreen(
15 BaseScreenDelegate* base_screen_delegate, 15 BaseScreenDelegate* base_screen_delegate,
16 KioskAutolaunchScreenActor* actor) 16 KioskAutolaunchScreenView* view)
17 : BaseScreen(base_screen_delegate, OobeScreen::SCREEN_KIOSK_AUTOLAUNCH), 17 : BaseScreen(base_screen_delegate, OobeScreen::SCREEN_KIOSK_AUTOLAUNCH),
18 actor_(actor) { 18 view_(view) {
19 DCHECK(actor_); 19 DCHECK(view_);
20 if (actor_) 20 if (view_)
21 actor_->SetDelegate(this); 21 view_->SetDelegate(this);
22 } 22 }
23 23
24 KioskAutolaunchScreen::~KioskAutolaunchScreen() { 24 KioskAutolaunchScreen::~KioskAutolaunchScreen() {
25 if (actor_) 25 if (view_)
26 actor_->SetDelegate(NULL); 26 view_->SetDelegate(NULL);
27 } 27 }
28 28
29 void KioskAutolaunchScreen::Show() { 29 void KioskAutolaunchScreen::Show() {
30 if (actor_) 30 if (view_)
31 actor_->Show(); 31 view_->Show();
32 } 32 }
33 33
34 void KioskAutolaunchScreen::OnExit(bool confirmed) { 34 void KioskAutolaunchScreen::OnExit(bool confirmed) {
35 Finish(confirmed ? BaseScreenDelegate::KIOSK_AUTOLAUNCH_CONFIRMED 35 Finish(confirmed ? BaseScreenDelegate::KIOSK_AUTOLAUNCH_CONFIRMED
36 : BaseScreenDelegate::KIOSK_AUTOLAUNCH_CANCELED); 36 : BaseScreenDelegate::KIOSK_AUTOLAUNCH_CANCELED);
37 } 37 }
38 38
39 void KioskAutolaunchScreen::OnActorDestroyed( 39 void KioskAutolaunchScreen::OnViewDestroyed(KioskAutolaunchScreenView* view) {
40 KioskAutolaunchScreenActor* actor) { 40 if (view_ == view)
41 if (actor_ == actor) 41 view_ = NULL;
42 actor_ = NULL;
43 } 42 }
44 43
45 } // namespace chromeos 44 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698