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

Unified Diff: chrome/browser/chromeos/login/screens/eula_screen.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
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 3454e05425cf7a320af4ddfb01e9a93b461bc336..19960231ed9e08b8984c9192fa7e546e5a90974d 100644
--- a/chrome/browser/chromeos/login/screens/eula_screen.cc
+++ b/chrome/browser/chromeos/login/screens/eula_screen.cc
@@ -27,6 +27,11 @@ EulaScreen::~EulaScreen() {
actor_->SetDelegate(NULL);
}
+void EulaScreen::SetDelegate(Delegate* delegate) {
+ DCHECK(delegate);
+ delegate_ = delegate;
+}
+
void EulaScreen::PrepareToShow() {
if (actor_)
actor_->PrepareToShow();
@@ -68,7 +73,8 @@ GURL EulaScreen::GetOemEulaUrl() const {
}
void EulaScreen::OnExit(bool accepted, bool usage_stats_enabled) {
- get_screen_observer()->SetUsageStatisticsReporting(usage_stats_enabled);
+ if (delegate_)
+ delegate_->SetUsageStatisticsReporting(usage_stats_enabled);
get_screen_observer()->OnExit(accepted
? ScreenObserver::EULA_ACCEPTED
: ScreenObserver::EULA_BACK);
@@ -90,7 +96,7 @@ void EulaScreen::OnPasswordFetched(const std::string& tpm_password) {
}
bool EulaScreen::IsUsageStatsEnabled() const {
- return get_screen_observer()->GetUsageStatisticsReporting();
+ return delegate_ && delegate_->GetUsageStatisticsReporting();
}
void EulaScreen::OnActorDestroyed(EulaScreenActor* actor) {
« no previous file with comments | « chrome/browser/chromeos/login/screens/eula_screen.h ('k') | chrome/browser/chromeos/login/screens/screen_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698