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

Unified Diff: chrome/browser/chromeos/login/session/user_session_manager.cc

Issue 2081873002: Incorporate comments in Dbus code and add Eol icon (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: incorporate comments from isherman@ Created 4 years, 6 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/eol_notification.cc ('k') | chrome/browser/resources/help/help_content.css » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/session/user_session_manager.cc
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc
index cb2b57d1bdf0ab6ad5f8af9858813fd28a713de9..f461799aa41dbea7994e0110f96a3cb2ddf71a97 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.cc
+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
@@ -1210,12 +1210,6 @@ void UserSessionManager::FinalizePrepareProfile(Profile* profile) {
// resolved.
if (delegate_)
delegate_->OnProfilePrepared(profile, browser_launched);
-
- // Check to see if this profile should show EndOfLife Notification and show
- // the message accordingly.
- if (!ShouldShowEolNotification(profile))
- return;
- CheckEolStatus(profile);
}
void UserSessionManager::ActivateWizard(const std::string& screen_name) {
@@ -1754,6 +1748,12 @@ void UserSessionManager::DoBrowserLaunchInternal(Profile* profile,
user_manager::UserManager::Get()->SessionStarted();
chromeos::BootTimesRecorder::Get()->LoginDone(
user_manager::UserManager::Get()->IsCurrentUserNew());
+
+ // Check to see if this profile should show EndOfLife Notification and show
+ // the message accordingly.
+ if (!ShouldShowEolNotification(profile))
+ return;
+ CheckEolStatus(profile);
}
void UserSessionManager::RespectLocalePreferenceWrapper(
@@ -1873,8 +1873,8 @@ void UserSessionManager::CreateTokenUtilIfMissing() {
}
bool UserSessionManager::ShouldShowEolNotification(Profile* profile) {
- if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
- chromeos::switches::kEnableEolNotification)) {
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ chromeos::switches::kDisableEolNotification)) {
return false;
}
« no previous file with comments | « chrome/browser/chromeos/eol_notification.cc ('k') | chrome/browser/resources/help/help_content.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698