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

Unified Diff: chrome/browser/chromeos/login/screens/kiosk_autolaunch_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_autolaunch_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.cc b/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.cc
index be7992ca1edb610195b3966c58c5477734d6e698..febcb9b4182048e7902a1d466f7ecb2c9f7a0bbd 100644
--- a/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.cc
+++ b/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.cc
@@ -6,14 +6,15 @@
#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 {
-KioskAutolaunchScreen::KioskAutolaunchScreen(ScreenObserver* observer,
- KioskAutolaunchScreenActor* actor)
- : BaseScreen(observer), actor_(actor) {
+KioskAutolaunchScreen::KioskAutolaunchScreen(
+ BaseScreenDelegate* base_screen_delegate,
+ KioskAutolaunchScreenActor* actor)
+ : BaseScreen(base_screen_delegate), actor_(actor) {
DCHECK(actor_);
if (actor_)
actor_->SetDelegate(this);
@@ -34,9 +35,9 @@ std::string KioskAutolaunchScreen::GetName() const {
}
void KioskAutolaunchScreen::OnExit(bool confirmed) {
- get_screen_observer()->OnExit(
- confirmed ? ScreenObserver::KIOSK_AUTOLAUNCH_CONFIRMED :
- ScreenObserver::KIOSK_AUTOLAUNCH_CANCELED);
+ get_base_screen_delegate()->OnExit(
+ confirmed ? BaseScreenDelegate::KIOSK_AUTOLAUNCH_CONFIRMED
+ : BaseScreenDelegate::KIOSK_AUTOLAUNCH_CANCELED);
}
void KioskAutolaunchScreen::OnActorDestroyed(

Powered by Google App Engine
This is Rietveld 408576698