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

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

Issue 2561023002: arc: ARC loading progress should not be shown when started from OOBE. (Closed)
Patch Set: rebased + comments updated Created 3 years, 11 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/arc_terms_of_service_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.cc b/chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.cc
index 691024f7e1c07db5b21a308cad4922350d0d649a..8fbd907a3f50ad570563006c79b44887c4444e80 100644
--- a/chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.cc
+++ b/chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.h"
+#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_actor.h"
#include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
#include "chrome/browser/metrics/metrics_reporting_state.h"
@@ -21,12 +22,12 @@ ArcTermsOfServiceScreen::ArcTermsOfServiceScreen(
actor_(actor) {
DCHECK(actor_);
if (actor_)
- actor_->SetDelegate(this);
+ actor_->AddObserver(this);
}
ArcTermsOfServiceScreen::~ArcTermsOfServiceScreen() {
if (actor_)
- actor_->SetDelegate(nullptr);
+ actor_->RemoveObserver(this);
}
void ArcTermsOfServiceScreen::Show() {
@@ -43,18 +44,10 @@ void ArcTermsOfServiceScreen::Hide() {
}
void ArcTermsOfServiceScreen::OnSkip() {
- ApplyTerms(false);
+ Finish(BaseScreenDelegate::ARC_TERMS_OF_SERVICE_FINISHED);
}
void ArcTermsOfServiceScreen::OnAccept() {
- ApplyTerms(true);
-}
-
-void ArcTermsOfServiceScreen::ApplyTerms(bool accepted) {
- Profile* profile = ProfileManager::GetActiveUserProfile();
- profile->GetPrefs()->SetBoolean(prefs::kArcTermsAccepted, accepted);
- profile->GetPrefs()->SetBoolean(prefs::kArcEnabled, accepted);
-
Finish(BaseScreenDelegate::ARC_TERMS_OF_SERVICE_FINISHED);
}

Powered by Google App Engine
This is Rietveld 408576698