Implemented event-dispatching for button clicks.

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_document.h"
 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
 #include "chrome/browser/chromeos/login/screens/eula_view.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 {
 
+const char kButtonIdAccept[] = "accept-button";

[dzhioev (left Google), 2014/11/27 12:08:51]

This constants should be defined in EulaModel, because they are part of model's
interface.

[Denis Kuznetsov (DE-MUC), 2014/11/27 13:51:41]

Acknowledged.

[ygorshenin1, 2014/11/27 14:11:13]

Done.

+const char kButtonIdBack[] = "back-button";
 const char kContextKeyUsageStatsEnabled[] = "usageStatsEnabled";
 
 }  // namespace
 
 EulaScreen::EulaScreen(BaseScreenDelegate* base_screen_delegate,
                        Delegate* delegate,
                        EulaView* view)
     : EulaModel(base_screen_delegate),
       delegate_(delegate),
       view_(view),
@@ skipping 38 matching lines @@
     if (!eula_page.empty())
       return GURL(eula_page);
 
     VLOG(1) << "No eula found for locale: " << locale;
   } else {
     LOG(ERROR) << "No manifest found.";
   }
   return GURL();
 }
 
-void EulaScreen::OnAcceptButtonClicked() {
-  Finish(BaseScreenDelegate::EULA_ACCEPTED);
-}
-
-void EulaScreen::OnBackButtonClicked() {
-  Finish(BaseScreenDelegate::EULA_BACK);
-}
-
 void EulaScreen::InitiatePasswordFetch() {
   if (tpm_password_.empty()) {
     password_fetcher_.Fetch();
     // Will call view after password has been fetched.
   } else if (view_) {
     view_->OnPasswordFetched(tpm_password_);
   }
 }
 
 void EulaScreen::OnPasswordFetched(const std::string& tpm_password) {
   tpm_password_ = tpm_password;
   if (view_)
     view_->OnPasswordFetched(tpm_password_);
 }
 
 bool EulaScreen::IsUsageStatsEnabled() const {
   return delegate_ && delegate_->GetUsageStatisticsReporting();
 }
 
 void EulaScreen::OnViewDestroyed(EulaView* view) {
   if (view_ == view)
     view_ = NULL;
 }
 
+void EulaScreen::OnButtonClicked(const std::string& button_id) {
+  if (button_id == kButtonIdAccept)
+    Finish(BaseScreenDelegate::EULA_ACCEPTED);
+  else if (button_id == kButtonIdBack)
+    Finish(BaseScreenDelegate::EULA_BACK);
+  else

[Denis Kuznetsov (DE-MUC), 2014/11/27 13:51:41]

I'd prefer to call the parent in the else-case and let the parent take
appropriate action (logging/notreached/etc).

[ygorshenin1, 2014/11/27 14:11:13]

Done.

+    LOG(ERROR) << "Unknown button: " << button_id;
+}
+
 void EulaScreen::OnContextKeyUpdated(
     const ::login::ScreenContext::KeyType& key) {
   if (key == kContextKeyUsageStatsEnabled && delegate_) {
     delegate_->SetUsageStatisticsReporting(
         context_.GetBoolean(kContextKeyUsageStatsEnabled));
   }
 }
 
 }  // namespace chromeos