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

Unified Diff: chrome/browser/chromeos/login/screens/device_disabled_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/device_disabled_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/device_disabled_screen.cc b/chrome/browser/chromeos/login/screens/device_disabled_screen.cc
index b84b336f256fe381896b7fd5295163e294cefd66..8b3141c737bbc001bdf713951d9e01b4a9789530 100644
--- a/chrome/browser/chromeos/login/screens/device_disabled_screen.cc
+++ b/chrome/browser/chromeos/login/screens/device_disabled_screen.cc
@@ -13,7 +13,7 @@
#include "base/values.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.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"
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
#include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
@@ -24,9 +24,10 @@
namespace chromeos {
-DeviceDisabledScreen::DeviceDisabledScreen(ScreenObserver* observer,
- DeviceDisabledScreenActor* actor)
- : BaseScreen(observer),
+DeviceDisabledScreen::DeviceDisabledScreen(
+ BaseScreenDelegate* base_screen_delegate,
+ DeviceDisabledScreenActor* actor)
+ : BaseScreen(base_screen_delegate),
showing_(false),
actor_(actor),
weak_factory_(this) {
@@ -106,7 +107,7 @@ void DeviceDisabledScreen::OnActorDestroyed(DeviceDisabledScreenActor* actor) {
}
void DeviceDisabledScreen::IndicateDeviceNotDisabled() {
- get_screen_observer()->OnExit(ScreenObserver::DEVICE_NOT_DISABLED);
+ get_base_screen_delegate()->OnExit(BaseScreenDelegate::DEVICE_NOT_DISABLED);
}
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698