From 4801879ec26e37c437ab8b9c3f96067a2e0afcb7 Mon Sep 17 00:00:00 2001 From: "sadrul@chromium.org" Date: Wed, 11 Apr 2012 17:53:33 +0000 Subject: chromeos: Remove old status-area related code. This removes --disable-ash-uber-tray from command-line and chrome://flags, and much of the code that becomes extinct because of this. BUG=122295 TEST=none Review URL: https://chromiumcodereview.appspot.com/10056001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131801 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/chromeos/status/data_promo_notification.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to '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 73f5566..553336c 100644 --- a/chrome/browser/chromeos/status/data_promo_notification.cc +++ b/chrome/browser/chromeos/status/data_promo_notification.cc @@ -12,7 +12,6 @@ #include "chrome/browser/chromeos/login/message_bubble.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/mobile_config.h" -#include "chrome/browser/chromeos/status/status_area_view_chromeos.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" @@ -126,6 +125,11 @@ DataPromoNotification::~DataPromoNotification() { mobile_data_bubble_->GetWidget()->Close(); } +void DataPromoNotification::RegisterPrefs(PrefService* local_state) { + // Carrier deal notification shown count defaults to 0. + local_state->RegisterIntegerPref(prefs::kCarrierDealPromoShown, 0); +} + void DataPromoNotification::ShowOptionalMobileDataPromoNotification( NetworkLibrary* cros, views::View* host, @@ -133,7 +137,7 @@ 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 (StatusAreaViewChromeos::IsBrowserMode() && + if (UserManager::Get()->IsUserLoggedIn() && !UserManager::Get()->IsLoggedInAsGuest() && check_for_promo_ && cros->cellular_connected() && !cros->ethernet_connected() && -- cgit v1.1