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

Unified Diff: chrome/browser/chromeos/login/screens/kiosk_enable_screen.cc

Issue 679133002: ScreenObserver is renamed to BaseScreenDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes. 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/screens/kiosk_enable_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/kiosk_enable_screen.cc b/chrome/browser/chromeos/login/screens/kiosk_enable_screen.cc
index 18f63e8d7c219a4d209aa1db3417cad92dcdfe65..7689a61cf612a66b428ae4e47966fbdff6c2327c 100644
--- a/chrome/browser/chromeos/login/screens/kiosk_enable_screen.cc
+++ b/chrome/browser/chromeos/login/screens/kiosk_enable_screen.cc
@@ -6,14 +6,14 @@
#include "base/logging.h"
#include "chrome/browser/chromeos/customization_document.h"
-#include "chrome/browser/chromeos/login/screens/screen_observer.h"
+#include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
namespace chromeos {
-KioskEnableScreen::KioskEnableScreen(ScreenObserver* observer,
+KioskEnableScreen::KioskEnableScreen(BaseScreenDelegate* base_screen_delegate,
KioskEnableScreenActor* actor)
- : BaseScreen(observer), actor_(actor) {
+ : BaseScreen(base_screen_delegate), actor_(actor) {
DCHECK(actor_);
if (actor_)
actor_->SetDelegate(this);
@@ -34,7 +34,8 @@ std::string KioskEnableScreen::GetName() const {
}
void KioskEnableScreen::OnExit() {
- get_screen_observer()->OnExit(ScreenObserver::KIOSK_ENABLE_COMPLETED);
+ get_base_screen_delegate()->OnExit(
+ BaseScreenDelegate::KIOSK_ENABLE_COMPLETED);
}
void KioskEnableScreen::OnActorDestroyed(KioskEnableScreenActor* actor) {

Powered by Google App Engine
This is Rietveld 408576698