| 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..e357b2e9270fb53c578148e4ca347665e4c96def 100644
|
| --- a/chrome/browser/chromeos/login/screens/eula_screen.cc
|
| +++ b/chrome/browser/chromeos/login/screens/eula_screen.cc
|
| @@ -17,12 +17,6 @@
|
|
|
| namespace chromeos {
|
|
|
| -namespace {
|
| -
|
| -const char kContextKeyUsageStatsEnabled[] = "usageStatsEnabled";
|
| -
|
| -} // namespace
|
| -
|
| EulaScreen::EulaScreen(BaseScreenDelegate* base_screen_delegate,
|
| Delegate* delegate,
|
| EulaView* view)
|
| @@ -77,14 +71,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 +95,15 @@ void EulaScreen::OnViewDestroyed(EulaView* view) {
|
| view_ = NULL;
|
| }
|
|
|
| +void EulaScreen::OnUserAction(const std::string& action_id) {
|
| + if (action_id == kUserActionAcceptButtonClicked)
|
| + Finish(BaseScreenDelegate::EULA_ACCEPTED);
|
| + else if (action_id == kUserActionBackButtonClicked)
|
| + Finish(BaseScreenDelegate::EULA_BACK);
|
| + else
|
| + BaseScreen::OnUserAction(action_id);
|
| +}
|
| +
|
| void EulaScreen::OnContextKeyUpdated(
|
| const ::login::ScreenContext::KeyType& key) {
|
| if (key == kContextKeyUsageStatsEnabled && delegate_) {
|
|
|