diff options
-rw-r--r-- | chrome/browser/chromeos/login/existing_user_controller.cc | 47 | ||||
-rw-r--r-- | chrome/browser/chromeos/login/existing_user_controller.h | 3 |
2 files changed, 0 insertions, 50 deletions
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc index 0918f48..8085500 100644 --- a/chrome/browser/chromeos/login/existing_user_controller.cc +++ b/chrome/browser/chromeos/login/existing_user_controller.cc @@ -812,8 +812,6 @@ void ExistingUserController::OnLoginSuccess( } void ExistingUserController::OnProfilePrepared(Profile* profile) { - OptionallyShowReleaseNotes(profile); - // Reenable clicking on other windows and status area. login_display_->SetUIEnabled(true); @@ -1086,51 +1084,6 @@ void ExistingUserController::InitializeStartUrls() const { } } -void ExistingUserController::OptionallyShowReleaseNotes( - Profile* profile) const { - // TODO(nkostylev): Fix WizardControllerFlowTest case. - if (!profile || KioskModeSettings::Get()->IsKioskModeEnabled()) - return; - if (UserManager::Get()->GetCurrentUserFlow()->ShouldSkipPostLoginScreens()) - return; - PrefService* prefs = profile->GetPrefs(); - chrome::VersionInfo version_info; - // New users would get this info with default getting started guide. - // In password changed case 2 options are available: - // 1. Cryptohome removed, pref is gone, not yet synced, recreate - // with latest version. - // 2. Cryptohome migrated, pref is available. To simplify implementation - // update version here too. Unlikely that user signs in first time on - // the machine after update with password changed. - if (UserManager::Get()->IsCurrentUserNew() || password_changed_) { - prefs->SetString(prefs::kChromeOSReleaseNotesVersion, - version_info.Version()); - return; - } - - std::string prev_version_pref = - prefs->GetString(prefs::kChromeOSReleaseNotesVersion); - Version prev_version(prev_version_pref); - if (!prev_version.IsValid()) - prev_version = Version("0.0.0.0"); - Version current_version(version_info.Version()); - - if (!current_version.components().size()) { - NOTREACHED() << "Incorrect version " << current_version.GetString(); - return; - } - - // No "Release Notes" content yet for upgrade from M19 to later release. - if (prev_version.components()[0] >= kReleaseNotesTargetRelease) - return; - - // Otherwise, trigger on major version change. - if (current_version.components()[0] > prev_version.components()[0]) { - prefs->SetString(prefs::kChromeOSReleaseNotesVersion, - current_version.GetString()); - } -} - void ExistingUserController::ShowError(int error_id, const std::string& details) { // TODO(dpolukhin): show detailed error info. |details| string contains diff --git a/chrome/browser/chromeos/login/existing_user_controller.h b/chrome/browser/chromeos/login/existing_user_controller.h index 220f99c..b249219 100644 --- a/chrome/browser/chromeos/login/existing_user_controller.h +++ b/chrome/browser/chromeos/login/existing_user_controller.h @@ -154,9 +154,6 @@ class ExistingUserController : public LoginDisplay::Delegate, // Adds first-time login URLs. void InitializeStartUrls() const; - // Shows "Release Notes"/"What's new"/Getting started guide on update. - void OptionallyShowReleaseNotes(Profile* profile) const; - // Show error message. |error_id| error message ID in resources. // If |details| string is not empty, it specify additional error text // provided by authenticator, it is not localized. |