Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(439)

Unified Diff: chrome/browser/chromeos/login/screens/eula_screen.cc

Issue 763563002: Implemented event-dispatching for button clicks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/screens/eula_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/eula_screen.cc b/chrome/browser/chromeos/login/screens/eula_screen.cc
index 0d6deff23d2cbab5166cde7dafd60fd819bac540..ef800ee50dea6c3c4d879688ec5ed2e1400a17d9 100644
--- a/chrome/browser/chromeos/login/screens/eula_screen.cc
+++ b/chrome/browser/chromeos/login/screens/eula_screen.cc
@@ -19,6 +19,8 @@ namespace chromeos {
namespace {
+const char kButtonIdAccept[] = "accept-button";
dzhioev (left Google) 2014/11/27 12:08:51 This constants should be defined in EulaModel, bec
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
@@ -77,14 +79,6 @@ GURL EulaScreen::GetOemEulaUrl() const {
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();
@@ -109,6 +103,15 @@ void EulaScreen::OnViewDestroyed(EulaView* 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
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_) {

Powered by Google App Engine
This is Rietveld 408576698