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..bc71a227d5a862d698e8e65381e58e1718151313 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" |
@@ -140,8 +140,8 @@ void DataPromoNotification::ShowOptionalMobileDataPromoNotification( |
// Display one-time notification for non-Guest 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() && |
+ if (LoginState::Get()->IsUserLoggedIn() && |
+ LoginState::Get()->GetLoginState() != LoginState::LOGGED_IN_GUEST && |
xiyuan
2013/04/04 21:24:54
Out of curiosity and out of the scope of the CL. S
stevenjb
2013/04/04 21:35:47
Good point, I think it can/should be safely fixed
|
check_for_promo_ && |
cros->cellular_connected() && !cros->ethernet_connected() && |
!cros->wifi_connected() && !cros->wimax_connected()) { |