cros: Fold EulaModel into EulaView.

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

 // 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.
 
 #include "chrome/browser/chromeos/login/screens/eula_screen.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/customization/customization_document.h"
 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
 #include "chrome/browser/chromeos/login/screens/eula_view.h"
+#include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_method_call_status.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 
 namespace chromeos {
+namespace {
+constexpr const char kUserActionAcceptButtonClicked[] = "accept-button";

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

Looks a bit crowded, a newline before this line may be nice

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

Done.

+constexpr const char kUserActionBackButtonClicked[] = "back-button";
+constexpr const char kContextKeyUsageStatsEnabled[] = "usageStatsEnabled";
+}  // namespace

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

Drop comment since the namespace is small

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

Keeping since I added newlines. I can remove if you feel strongly.

 
 EulaScreen::EulaScreen(BaseScreenDelegate* base_screen_delegate,
                        Delegate* delegate,
                        EulaView* view)
-    : EulaModel(base_screen_delegate),
+    : BaseScreen(base_screen_delegate, OobeScreen::SCREEN_OOBE_EULA),
       delegate_(delegate),
       view_(view),
       password_fetcher_(this) {
   DCHECK(view_);
   DCHECK(delegate_);
   if (view_)
-    view_->Bind(*this);
+    view_->Bind(this);
 }
 
 EulaScreen::~EulaScreen() {
   if (view_)
     view_->Unbind();
 }
 
 void EulaScreen::Show() {
   // Command to own the TPM.
   DBusThreadManager::Get()->GetCryptohomeClient()->TpmCanAttemptOwnership(
       EmptyVoidDBusMethodCallback());
   if (policy::DeviceCloudPolicyManagerChromeOS::GetZeroTouchEnrollmentMode() ==
       policy::ZeroTouchEnrollmentMode::HANDS_OFF)
-    OnUserAction(EulaModel::kUserActionAcceptButtonClicked);
+    OnUserAction(kUserActionAcceptButtonClicked);
   else if (view_)
     view_->Show();
 }
 
 void EulaScreen::Hide() {
   if (view_)
     view_->Hide();
 }
 
 GURL EulaScreen::GetOemEulaUrl() const {
@@ skipping 49 matching lines @@
 
 void EulaScreen::OnContextKeyUpdated(
     const ::login::ScreenContext::KeyType& key) {
   if (key == kContextKeyUsageStatsEnabled && delegate_) {
     delegate_->SetUsageStatisticsReporting(
         context_.GetBoolean(kContextKeyUsageStatsEnabled));
   }
 }
 
 }  // namespace chromeos