| Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| index 6fb9aa19d3c691d05e4045c2cff368f4261d69f3..1588834a1210d9e82217c5cdd40d9b24911252ff 100644
|
| --- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| +++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| @@ -65,6 +65,7 @@
|
| #include "chrome/browser/chromeos/login/user_manager.h"
|
| #include "chrome/browser/chromeos/options/network_config_view.h"
|
| #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
|
| +#include "chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.h"
|
| #include "chrome/browser/chromeos/settings/cros_settings.h"
|
| #include "chrome/browser/chromeos/sim_dialog_delegate.h"
|
| #include "chrome/browser/chromeos/system_key_event_listener.h"
|
| @@ -238,6 +239,12 @@ void ShowNetworkSettingsPage(const std::string& service_path) {
|
| ProfileManager::GetPrimaryUserProfile());
|
| }
|
|
|
| +void onAcceptMultiprofilesIntro(bool no_show_again) {
|
| + PrefService* prefs = ProfileManager::GetActiveUserProfile()->GetPrefs();
|
| + prefs->SetBoolean(prefs::kMultiProfileNeverShowIntro, no_show_again);
|
| + UserAddingScreen::Get()->Start();
|
| +}
|
| +
|
| class SystemTrayDelegate : public ash::SystemTrayDelegate,
|
| public SessionManagerClient::Observer,
|
| public drive::JobListObserver,
|
| @@ -629,8 +636,16 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
|
| return;
|
|
|
| // Launch sign in screen to add another user to current session.
|
| - if (UserManager::Get()->GetUsersAdmittedForMultiProfile().size())
|
| - UserAddingScreen::Get()->Start();
|
| + if (UserManager::Get()->GetUsersAdmittedForMultiProfile().size()) {
|
| + bool show_intro = !ProfileManager::GetActiveUserProfile()->
|
| + GetPrefs()->GetBoolean(prefs::kMultiProfileNeverShowIntro);
|
| + base::Callback<void(bool)> on_accept = base::Bind(
|
| + &onAcceptMultiprofilesIntro);
|
| + if (show_intro)
|
| + ShowMultiprofilesIntroDialog(on_accept);
|
| + else
|
| + UserAddingScreen::Get()->Start();
|
| + }
|
| }
|
|
|
| virtual void ShowSpringChargerReplacementDialog() OVERRIDE {
|
|
|