Index: chrome/browser/chromeos/status/data_promo_notification.cc |
diff --git a/chrome/browser/chromeos/status/data_promo_notification.cc b/chrome/browser/chromeos/status/data_promo_notification.cc |
index edda26f8f81a90787f36f607f63cc7d7a87c5767..a623aeff091440a5ffe9499dfdbc02bfcd2aa4cf 100644 |
--- a/chrome/browser/chromeos/status/data_promo_notification.cc |
+++ b/chrome/browser/chromeos/status/data_promo_notification.cc |
@@ -16,13 +16,13 @@ |
#include "chrome/browser/chromeos/cros/cros_library.h" |
#include "chrome/browser/chromeos/cros/network_library.h" |
#include "chrome/browser/chromeos/login/helper.h" |
-#include "chrome/browser/chromeos/login/user_manager.h" |
#include "chrome/browser/chromeos/mobile_config.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/profiles/profile_manager.h" |
#include "chrome/browser/ui/browser.h" |
#include "chrome/browser/ui/browser_list.h" |
#include "chrome/common/pref_names.h" |
+#include "chromeos/login/login_state.h" |
#include "grit/generated_resources.h" |
#include "grit/theme_resources.h" |
#include "ui/base/l10n/l10n_util.h" |
@@ -137,11 +137,13 @@ void DataPromoNotification::ShowOptionalMobileDataPromoNotification( |
NetworkLibrary* cros, |
views::View* host, |
ash::NetworkTrayDelegate* listener) { |
- // Display one-time notification for non-Guest users on first use |
+ // Display one-time notification for regular users on first use |
// of Mobile Data connection or if there's a carrier deal defined |
// show that even if user has already seen generic promo. |
- if (UserManager::Get()->IsUserLoggedIn() && |
- !UserManager::Get()->IsLoggedInAsGuest() && |
+ LoginState::LoggedInUserType user_type = |
+ LoginState::Get()->GetLoggedInUserType(); |
+ if ((user_type == LoginState::LOGGED_IN_USER_OWNER || |
+ user_type == LoginState::LOGGED_IN_USER_REGULAR) && |
check_for_promo_ && |
cros->cellular_connected() && !cros->ethernet_connected() && |
!cros->wifi_connected() && !cros->wimax_connected()) { |