Chromium Code Reviews| Index: chrome/browser/chromeos/login/screens/eula_screen.h |
| diff --git a/chrome/browser/chromeos/login/screens/eula_screen.h b/chrome/browser/chromeos/login/screens/eula_screen.h |
| index cf25229cab262b82d34708a59fd807aefae72dd7..da28ae962f78e021ae09ebffad9a230ae87d65bb 100644 |
| --- a/chrome/browser/chromeos/login/screens/eula_screen.h |
| +++ b/chrome/browser/chromeos/login/screens/eula_screen.h |
| @@ -9,17 +9,16 @@ |
| #include "base/compiler_specific.h" |
| #include "chrome/browser/chromeos/login/screens/base_screen.h" |
| -#include "chrome/browser/chromeos/login/screens/eula_screen_actor.h" |
| +#include "chrome/browser/chromeos/login/screens/eula_model.h" |
| #include "chromeos/tpm_password_fetcher.h" |
| +#include "components/login/screens/screen_context.h" |
| #include "url/gurl.h" |
| namespace chromeos { |
| // Representation independent class that controls OOBE screen showing EULA |
| // to users. |
| -class EulaScreen : public BaseScreen, |
| - public EulaScreenActor::Delegate, |
| - public TpmPasswordFetcherDelegate { |
| +class EulaScreen : public EulaModel, public TpmPasswordFetcherDelegate { |
| public: |
| class Delegate { |
|
Denis Kuznetsov (DE-MUC)
2014/11/25 17:31:17
Do we still need this delegate?
ygorshenin1
2014/11/26 11:45:40
Yes, because only WizardController knows how to Se
|
| public: |
| @@ -32,26 +31,29 @@ class EulaScreen : public BaseScreen, |
| EulaScreen(BaseScreenDelegate* base_screen_delegate, |
| Delegate* delegate, |
| - EulaScreenActor* actor); |
| + EulaView* view); |
| virtual ~EulaScreen(); |
| - // BaseScreen implementation: |
| + // EulaModel implementation: |
| virtual void PrepareToShow() override; |
| virtual void Show() override; |
| virtual void Hide() override; |
| virtual std::string GetName() const override; |
| - |
| - // EulaScreenActor::Delegate implementation: |
| virtual GURL GetOemEulaUrl() const override; |
| - virtual void OnExit(bool accepted, bool usage_stats_enabled) override; |
| + virtual void OnAcceptButtonClicked() override; |
| + virtual void OnBackButtonClicked() override; |
| virtual void InitiatePasswordFetch() override; |
| virtual bool IsUsageStatsEnabled() const override; |
| - virtual void OnActorDestroyed(EulaScreenActor* actor) override; |
| + virtual void OnViewDestroyed(EulaView* view) override; |
| // TpmPasswordFetcherDelegate implementation: |
| virtual void OnPasswordFetched(const std::string& tpm_password) override; |
| private: |
| + void OnUsageStatisticsReportingChanged( |
| + const ::login::ScreenContext::KeyType& key, |
| + const base::Value& value); |
| + |
| // URL of the OEM EULA page (on disk). |
| GURL oem_eula_page_; |
| @@ -64,10 +66,12 @@ class EulaScreen : public BaseScreen, |
| Delegate* delegate_; |
| - EulaScreenActor* actor_; |
| + EulaView* view_; |
| TpmPasswordFetcher password_fetcher_; |
| + scoped_ptr<::login::ScreenContext::KeyObserverSubscription> subscription_; |
| + |
| DISALLOW_COPY_AND_ASSIGN(EulaScreen); |
| }; |