Chromium Code Reviews| 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 f30aab8e2eff53d065a8d489f8744e5a8aa77c8f..e5086a35823ee17e14e43b5f88485b63ed1bbe89 100644 |
| --- a/chrome/browser/chromeos/login/session/user_session_manager.cc |
| +++ b/chrome/browser/chromeos/login/session/user_session_manager.cc |
| @@ -32,6 +32,7 @@ |
| #include "chrome/browser/chromeos/base/locale_util.h" |
| #include "chrome/browser/chromeos/boot_times_recorder.h" |
| #include "chrome/browser/chromeos/first_run/first_run.h" |
| +#include "chrome/browser/chromeos/first_run/goodies_displayer.h" |
| #include "chrome/browser/chromeos/input_method/input_method_util.h" |
| #include "chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h" |
| #include "chrome/browser/chromeos/login/chrome_restart_request.h" |
| @@ -350,6 +351,7 @@ void UserSessionManager::OverrideHomedir() { |
| void UserSessionManager::RegisterPrefs(PrefRegistrySimple* registry) { |
| registry->RegisterStringPref(prefs::kRLZBrand, std::string()); |
| registry->RegisterBooleanPref(prefs::kRLZDisabled, false); |
| + registry->RegisterBooleanPref(prefs::kCanShowOobeGoodiesPage, true); |
|
Greg Levin
2015/09/15 00:12:11
I don't know the rules for where to register prefs
|
| } |
| UserSessionManager::UserSessionManager() |
| @@ -1137,6 +1139,9 @@ void UserSessionManager::FinalizePrepareProfile(Profile* profile) { |
| // launch browser. |
| bool browser_launched = InitializeUserSession(profile); |
| + // Check whether to, then set up for, display OOBE Goodies page on first run. |
| + first_run::InitializeGoodiesDisplayer(); |
| + |
| // TODO(nkostylev): This pointer should probably never be NULL, but it looks |
| // like OnProfileCreated() may be getting called before |
| // UserSessionManager::PrepareProfile() has set |delegate_| when Chrome is |