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

Unified Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 672233002: ScreenObserver::(Set|Get)UsageStatisticsReporting() are extracted into EulaScreen::Delegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 6 years, 2 months 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
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/wizard_controller.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index b79c69718d60730a3b8cc6bd28693cbe56a4b111..5ed4fcc116093219aeea0a8688c242b3e2adaa34 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -304,7 +304,10 @@ BaseScreen* WizardController::CreateScreen(const std::string& screen_name) {
return new chromeos::UserImageScreen(
this, oobe_display_->GetUserImageScreenActor());
} else if (screen_name == kEulaScreenName) {
- return new chromeos::EulaScreen(this, oobe_display_->GetEulaScreenActor());
+ scoped_ptr<chromeos::EulaScreen> screen(
+ new chromeos::EulaScreen(this, oobe_display_->GetEulaScreenActor()));
+ screen->SetDelegate(this);
+ return screen.release();
} else if (screen_name == kEnrollmentScreenName) {
return new chromeos::EnrollmentScreen(
this, oobe_display_->GetEnrollmentScreenActor());
@@ -1022,14 +1025,6 @@ void WizardController::OnSetUserNamePassword(const std::string& username,
password_ = password;
}
-void WizardController::SetUsageStatisticsReporting(bool val) {
- usage_statistics_reporting_ = val;
-}
-
-bool WizardController::GetUsageStatisticsReporting() const {
- return usage_statistics_reporting_;
-}
-
void WizardController::ShowErrorScreen() {
VLOG(1) << "Showing error screen.";
SetCurrentScreen(GetScreen(kErrorScreenName));
@@ -1041,6 +1036,14 @@ void WizardController::HideErrorScreen(BaseScreen* parent_screen) {
SetCurrentScreen(parent_screen);
}
+void WizardController::SetUsageStatisticsReporting(bool val) {
+ usage_statistics_reporting_ = val;
+}
+
+bool WizardController::GetUsageStatisticsReporting() const {
+ return usage_statistics_reporting_;
+}
+
void WizardController::OnAccessibilityStatusChanged(
const AccessibilityStatusEventDetails& details) {
enum AccessibilityNotificationType type = details.notification_type;
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698