cros: Fold EulaModel into EulaView.

chrome/browser/chromeos/login/screens/eula_screen.h

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 83a0d4a914666001476293dd3eb0769f2142ea20..65a068328be1dc958bc0298941bee65323a95b74 100644
--- a/chrome/browser/chromeos/login/screens/eula_screen.h
+++ b/chrome/browser/chromeos/login/screens/eula_screen.h
@@ -10,16 +10,18 @@
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "chrome/browser/chromeos/login/screens/base_screen.h"
-#include "chrome/browser/chromeos/login/screens/eula_model.h"
 #include "chromeos/tpm/tpm_password_fetcher.h"
 #include "components/login/screens/screen_context.h"
 #include "url/gurl.h"
 
 namespace chromeos {
 
+class BaseScreenDelegate;
+class EulaView;
+
 // Representation independent class that controls OOBE screen showing EULA
 // to users.
-class EulaScreen : public EulaModel, public TpmPasswordFetcherDelegate {
+class EulaScreen : public BaseScreen, public TpmPasswordFetcherDelegate {
  public:
   class Delegate {
    public:
@@ -35,13 +37,24 @@ class EulaScreen : public EulaModel, public TpmPasswordFetcherDelegate {
              EulaView* view);
   ~EulaScreen() override;
 
-  // EulaModel implementation:
+  // BaseScreen implementation:
   void Show() override;
   void Hide() override;
-  GURL GetOemEulaUrl() const override;
-  void InitiatePasswordFetch() override;
-  bool IsUsageStatsEnabled() const override;
-  void OnViewDestroyed(EulaView* view) override;
+
+  // Returns URL of the OEM EULA page that should be displayed using current
+  // locale and manifest. Returns empty URL otherwise.
+  GURL GetOemEulaUrl() const;
+
+  // Initiate TPM password fetch. Will call actor's OnPasswordFetched() when
+  // done.
+  void InitiatePasswordFetch();
+
+  // Returns true if usage statistics reporting is enabled.
+  bool IsUsageStatsEnabled() const;
+
+  // This method is called, when view is being destroyed. Note, if model
+  // is destroyed earlier then it has to call SetModel(NULL).
+  void OnViewDestroyed(EulaView* view);
   void OnUserAction(const std::string& action_id) override;

[achuithb, 2017/01/13 20:10:05]

These overrides (OnUserAction and OnContextKeyUpdated) belong with Show() and
Hide(). 

Can we make these overrides private? I assume they are accessed through a base
pointer.

[jdufault, 2017/01/14 00:03:29]

Done.

   void OnContextKeyUpdated(const ::login::ScreenContext::KeyType& key) override;