[cros] Move carrier deal shown property to LocalState.

chrome/browser/chromeos/status/network_menu_button.cc

 // Copyright (c) 2011 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/network_menu_button.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/logging.h"
@@ skipping 30 matching lines @@
 bool GetBooleanPref(const char* pref_name) {
   Browser* browser = BrowserList::GetLastActive();
   // Default to safe value which is false (not to show bubble).
   if (!browser || !browser->profile())
     return false;
 
   PrefService* prefs = browser->profile()->GetPrefs();
   return prefs->GetBoolean(pref_name);
 }
 
-int GetIntegerPref(const char* pref_name) {
-  Browser* browser = BrowserList::GetLastActive();
-  // Default to "safe" value.
-  if (!browser || !browser->profile())
-    return kNotificationCountPrefDefault;
-
-  PrefService* prefs = browser->profile()->GetPrefs();
+int GetIntegerLocalPref(const char* pref_name) {
+  PrefService* prefs = g_browser_process->local_state();
   return prefs->GetInteger(pref_name);
 }
 
 void SetBooleanPref(const char* pref_name, bool value) {
   Browser* browser = BrowserList::GetLastActive();
   if (!browser || !browser->profile())
     return;
 
   PrefService* prefs = browser->profile()->GetPrefs();
   prefs->SetBoolean(pref_name, value);
 }
 
-void SetIntegerPref(const char* pref_name, int value) {
-  Browser* browser = BrowserList::GetLastActive();
-  if (!browser || !browser->profile())
-    return;
-
-  PrefService* prefs = browser->profile()->GetPrefs();
+void SetIntegerLocalPref(const char* pref_name, int value) {
+  PrefService* prefs = g_browser_process->local_state();
   prefs->SetInteger(pref_name, value);
 }
 
 // Returns prefs::kShow3gPromoNotification or false
 // if there's no active browser.
 bool ShouldShow3gPromoNotification() {
   return GetBooleanPref(prefs::kShow3gPromoNotification);
 }
 
 void SetShow3gPromoNotification(bool value) {
   SetBooleanPref(prefs::kShow3gPromoNotification, value);
 }
 // Returns prefs::kCarrierDealPromoShown which is number of times

[Dmitry Polukhin, 2011/05/23 12:46:59]

Please add empty line above the comment.

[Nikita (slow), 2011/05/24 08:22:53]

Done.

-// carrier deal notification has been shown to user or -1
-// if there's no active browser.
+// carrier deal notification has been shown to users on this machine.
 int GetCarrierDealPromoShown() {
-  return GetIntegerPref(prefs::kCarrierDealPromoShown);
+  return GetIntegerLocalPref(prefs::kCarrierDealPromoShown);
 }
 
 void SetCarrierDealPromoShown(int value) {
-  SetIntegerPref(prefs::kCarrierDealPromoShown, value);
+  SetIntegerLocalPref(prefs::kCarrierDealPromoShown, value);
 }
 
 }  // namespace
 
 namespace chromeos {
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuButton
 
 // static
@@ skipping 26 matching lines @@
   NetworkLibrary* netlib = CrosLibrary::Get()->GetNetworkLibrary();
   netlib->RemoveNetworkManagerObserver(this);
   netlib->RemoveObserverForAllNetworks(this);
   netlib->RemoveCellularDataPlanObserver(this);
   if (!cellular_device_path_.empty())
     netlib->RemoveNetworkDeviceObserver(cellular_device_path_, this);
   if (mobile_data_bubble_)
     mobile_data_bubble_->Close();
 }
 
+// static
+void NetworkMenuButton::RegisterPrefs(PrefService* local_state) {
+  // Carrier deal notification shown count defaults to 0.
+  local_state->RegisterIntegerPref(prefs::kCarrierDealPromoShown, 0);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuButton, ui::AnimationDelegate implementation:
 
 void NetworkMenuButton::AnimationProgressed(const ui::Animation* animation) {
   if (animation == &animation_connecting_) {
     SetIconOnly(IconForNetworkConnecting(
         animation_connecting_.GetCurrentValue(), false));
     // No need to set the badge here, because it should already be set.
     SchedulePaint();
   } else {
@@ skipping 337 matching lines @@
         this);
 
     check_for_promo_ = false;
     SetShow3gPromoNotification(false);
     if (carrier_deal_promo_pref != kNotificationCountPrefDefault)
       SetCarrierDealPromoShown(carrier_deal_promo_pref + 1);
   }
 }
 
 }  // namespace chromeos