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

Unified Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Issue 93633007: Created optional multiprofiles introduction dialog. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years 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
Index: chrome/browser/chromeos/system/ash_system_tray_delegate.cc
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
index 5a49a4dadfd9a04de98a879194be14a14295badd..008c4c69c5ed628e84e0c67900b4238efc021aaa 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.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_view.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"
@@ -629,8 +630,14 @@ 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::kMultiProfileIntroShowDismissed);
+ if (show_intro)
+ multiprofiles::IntroDialog();
+ else
+ UserAddingScreen::Get()->Start();
+ }
}
virtual void ShowSpringChargerReplacementDialog() OVERRIDE {

Powered by Google App Engine
This is Rietveld 408576698