cros: Fold EulaModel into EulaView.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_EULA_SCREEN_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_EULA_SCREEN_H_
 
 #include <string>
 
 #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:
     virtual ~Delegate() {}
 
     // Whether usage statistics reporting is enabled on EULA screen.
     virtual void SetUsageStatisticsReporting(bool val) = 0;
     virtual bool GetUsageStatisticsReporting() const = 0;
   };
 
   EulaScreen(BaseScreenDelegate* base_screen_delegate,
              Delegate* delegate,
              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;
 
   // TpmPasswordFetcherDelegate implementation:
   void OnPasswordFetched(const std::string& tpm_password) override;
 
  private:
   // URL of the OEM EULA page (on disk).
   GURL oem_eula_page_;
 
   // TPM password local storage. By convention, we clear the password
   // from TPM as soon as we read it. We store it here locally until
   // EULA screen is closed.
   // TODO(glotov): Sanitize memory used to store password when
   // it's destroyed.
   std::string tpm_password_;
 
   Delegate* delegate_;
 
   EulaView* view_;
 
   TpmPasswordFetcher password_fetcher_;
 
   DISALLOW_COPY_AND_ASSIGN(EulaScreen);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_EULA_SCREEN_H_