Add LoginState class to src/chromeos/login

chrome/browser/chromeos/status/data_promo_notification.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/status/data_promo_notification.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/chromeos/network/network_observer.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #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"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // Time in milliseconds to delay showing of promo
@@ skipping 97 matching lines @@
   registry->RegisterIntegerPref(prefs::kCarrierDealPromoShown, 0);
 }
 
 void DataPromoNotification::ShowOptionalMobileDataPromoNotification(
     NetworkLibrary* cros,
     views::View* host,
     ash::NetworkTrayDelegate* listener) {
   // 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. Should we only offer the data
promo only to a normal user? It does not make much sense for public account,
retail mode and kiosk app robot.

[stevenjb, 2013/04/04 21:35:47]

Good point, I think it can/should be safely fixed here. Done.

       check_for_promo_ &&
       cros->cellular_connected() && !cros->ethernet_connected() &&
       !cros->wifi_connected() && !cros->wimax_connected()) {
     std::string deal_text;
     int carrier_deal_promo_pref = kNotificationCountPrefDefault;
     const MobileConfig::CarrierDeal* deal = NULL;
     const MobileConfig::Carrier* carrier = GetCarrier(cros);
     if (carrier)
       deal = GetCarrierDeal(carrier);
     deal_info_url_.clear();
@@ skipping 46 matching lines @@
       SetCarrierDealPromoShown(carrier_deal_promo_pref + 1);
   }
 }
 
 void DataPromoNotification::CloseNotification() {
   ash::Shell::GetInstance()->system_tray_notifier()->NotifyClearNetworkMessage(
       ash::NetworkObserver::MESSAGE_DATA_PROMO);
 }
 
 }  // namespace chromeos