Chromium Code Reviews| 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..da08f6825826c49bf949c71c5b310135a0a2b00f 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" |
| @@ -22,11 +22,11 @@ class ArcOptInPreferenceHandler; |
| namespace chromeos { |
| // The sole implementation of the ArcTermsOfServiceScreenActor, using WebUI. |
|
hidehiko
2017/02/23 05:34:08
s/Actor/View/
jdufault
2017/02/24 00:40:17
Done.
|
| -class ArcTermsOfServiceScreenHandler : |
| - public BaseScreenHandler, |
| - public ArcTermsOfServiceScreenActor, |
| - public arc::ArcOptInPreferenceHandlerObserver, |
| - public system::TimezoneSettings::Observer { |
| +class ArcTermsOfServiceScreenHandler |
| + : public BaseScreenHandler, |
| + public ArcTermsOfServiceScreenView, |
| + public arc::ArcOptInPreferenceHandlerObserver, |
| + public system::TimezoneSettings::Observer { |
| public: |
| ArcTermsOfServiceScreenHandler(); |
| ~ArcTermsOfServiceScreenHandler() override; |
| @@ -39,8 +39,8 @@ class ArcTermsOfServiceScreenHandler : |
| ::login::LocalizedValuesBuilder* builder) override; |
| // ArcTermsOfServiceScreenActor: |
|
hidehiko
2017/02/23 05:34:08
s/Actor/View/
jdufault
2017/02/24 00:40:17
Done.
|
| - void AddObserver(ArcTermsOfServiceScreenActorObserver* observer) override; |
| - void RemoveObserver(ArcTermsOfServiceScreenActorObserver* observer) override; |
| + 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; |