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

Unified Diff: chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.h

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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.h
diff --git a/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.h
index bd0a1f3363ac06dc10bfb2fd39b361ddd87c6f30..f37747ee3cc9f8e7cbbac897a4be50fa1afd3800 100644
--- a/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.h
@@ -11,7 +11,7 @@
#include "base/macros.h"
#include "base/observer_list.h"
#include "chrome/browser/chromeos/arc/optin/arc_optin_preference_handler_observer.h"
-#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_view.h"
#include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
#include "chromeos/settings/timezone_settings.h"
@@ -21,12 +21,12 @@ class ArcOptInPreferenceHandler;
namespace chromeos {
-// The sole implementation of the ArcTermsOfServiceScreenActor, using WebUI.
-class ArcTermsOfServiceScreenHandler :
- public BaseScreenHandler,
- public ArcTermsOfServiceScreenActor,
- public arc::ArcOptInPreferenceHandlerObserver,
- public system::TimezoneSettings::Observer {
+// The sole implementation of the ArcTermsOfServiceScreenView, using WebUI.
+class ArcTermsOfServiceScreenHandler
+ : public BaseScreenHandler,
+ public ArcTermsOfServiceScreenView,
+ public arc::ArcOptInPreferenceHandlerObserver,
+ public system::TimezoneSettings::Observer {
public:
ArcTermsOfServiceScreenHandler();
~ArcTermsOfServiceScreenHandler() override;
@@ -38,9 +38,9 @@ class ArcTermsOfServiceScreenHandler :
void DeclareLocalizedValues(
::login::LocalizedValuesBuilder* builder) override;
- // ArcTermsOfServiceScreenActor:
- void AddObserver(ArcTermsOfServiceScreenActorObserver* observer) override;
- void RemoveObserver(ArcTermsOfServiceScreenActorObserver* observer) override;
+ // ArcTermsOfServiceScreenView:
+ void AddObserver(ArcTermsOfServiceScreenViewObserver* observer) override;
+ void RemoveObserver(ArcTermsOfServiceScreenViewObserver* observer) override;
void Show() override;
void Hide() override;
@@ -62,8 +62,7 @@ class ArcTermsOfServiceScreenHandler :
void OnBackupAndRestoreModeChanged(bool enabled, bool managed) override;
void OnLocationServicesModeChanged(bool enabled, bool managed) override;
- base::ObserverList<ArcTermsOfServiceScreenActorObserver, true>
- observer_list_;
+ base::ObserverList<ArcTermsOfServiceScreenViewObserver, true> observer_list_;
// Whether the screen should be shown right after initialization.
bool show_on_init_ = false;

Powered by Google App Engine
This is Rietveld 408576698