Chromium Code Reviews| Index: chrome/browser/chromeos/arc/arc_session_manager.h |
| diff --git a/chrome/browser/chromeos/arc/arc_session_manager.h b/chrome/browser/chromeos/arc/arc_session_manager.h |
| index 59678ace4025fbc776d7a10a5c7f89bb57f16bb3..612a75ba257f468263cd3500957ab877c66e0472 100644 |
| --- a/chrome/browser/chromeos/arc/arc_session_manager.h |
| +++ b/chrome/browser/chromeos/arc/arc_session_manager.h |
| @@ -78,7 +78,7 @@ class ArcSessionManager : public ArcService, |
| // In the first boot case (no OOBE case): |
| // STOPPED -> SHOWING_TERMS_OF_SERVICE: when arc.enabled preference is set. |
| // SHOWING_TERMS_OF_SERVICE -> CHECKING_ANDROID_MANAGEMENT: when a user |
| - // agree with "Terms Of Service" |
| + // accepts "Terms Of Service" |
|
hidehiko
2016/12/20 15:20:45
Wow, thanks!
khmel
2016/12/20 16:27:58
Acknowledged.
|
| // CHECKING_ANDROID_MANAGEMENT -> FETCHING_CODE: when Android management |
| // check passes. |
| // FETCHING_CODE -> ACTIVE: when the auth token is successfully fetched. |
| @@ -179,9 +179,9 @@ class ArcSessionManager : public ArcService, |
| // ArcSupportHost::Observer: |
| void OnWindowClosed() override; |
| - void OnTermsAgreed(bool is_metrics_enabled, |
| - bool is_backup_and_restore_enabled, |
| - bool is_location_service_enabled) override; |
| + void OnTermsAccepted(bool is_metrics_enabled, |
| + bool is_backup_and_restore_enabled, |
| + bool is_location_service_enabled) override; |
| void OnRetryClicked() override; |
| void OnSendFeedbackClicked() override; |
| @@ -211,12 +211,12 @@ class ArcSessionManager : public ArcService, |
| private: |
| // Negotiates the terms of service to user. |
| - void StartTermsOfServiceNegotiation(); |
| + void StartTermsOfServiceNegotiation(bool initial_run); |
| void OnTermsOfServiceNegotiated(bool accepted); |
| void SetState(State state); |
| void ShutdownBridge(); |
| - void OnOptInPreferenceChanged(); |
| + void OnOptInPreferenceChanged(bool initial_run); |
| void OnAndroidManagementPassed(); |
| void OnArcDataRemoved(bool success); |
| void OnArcSignInTimeout(); |