Landing change for ers@chromium.org: http://codereview.chromium.org/4134012/s...

chrome/browser/chromeos/network_message_observer.cc

 // Copyright (c) 2010 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/network_message_observer.h"
 
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/stl_util-inl.h"
 #include "base/string_number_conversions.h"
@@ skipping 17 matching lines @@
     : initialized_(false),
       notification_connection_error_(profile, "network_connection.chromeos",
           IDR_NOTIFICATION_NETWORK_FAILED,
           l10n_util::GetStringUTF16(IDS_NETWORK_CONNECTION_ERROR_TITLE)),
       notification_low_data_(profile, "network_low_data.chromeos",
           IDR_NOTIFICATION_BARS_CRITICAL,
           l10n_util::GetStringUTF16(IDS_NETWORK_LOW_DATA_TITLE)),
       notification_no_data_(profile, "network_no_data.chromeos",
           IDR_NOTIFICATION_BARS_EMPTY,
           l10n_util::GetStringUTF16(IDS_NETWORK_OUT_OF_DATA_TITLE)) {
-  NetworkChanged(CrosLibrary::Get()->GetNetworkLibrary());
+  NetworkLibrary* netlib = CrosLibrary::Get()->GetNetworkLibrary();
+  OnNetworkManagerChanged(netlib);
+  // Note that this gets added as a NetworkManagerObserver and a
+  // CellularDataPlanObserver in browser_init.cc
   initialized_ = true;
 }
 
 NetworkMessageObserver::~NetworkMessageObserver() {
+  NetworkLibrary* netlib = CrosLibrary::Get()->GetNetworkLibrary();
+  netlib->RemoveNetworkManagerObserver(this);
+  netlib->RemoveCellularDataPlanObserver(this);
   notification_connection_error_.Hide();
   notification_low_data_.Hide();
   notification_no_data_.Hide();
   STLDeleteValues(&cellular_networks_);
   STLDeleteValues(&wifi_networks_);
 }
 
 void NetworkMessageObserver::CreateModalPopup(views::WindowDelegate* view) {
   Browser* browser = BrowserList::GetLastActive();
   if (browser && browser->type() != Browser::TYPE_NORMAL) {
     browser = BrowserList::FindBrowserWithType(browser->profile(),
                                                Browser::TYPE_NORMAL,
                                                true);
   }
   DCHECK(browser);
   views::Window* window = browser::CreateViewsWindow(
       browser->window()->GetNativeHandle(), gfx::Rect(), view);
   window->SetIsAlwaysOnTop(true);
   window->Show();
 }
 
 void NetworkMessageObserver::MobileSetup(const ListValue* args) {
   BrowserList::GetLastActive()->OpenMobilePlanTabAndActivate();
 }
 
-void NetworkMessageObserver::NetworkChanged(NetworkLibrary* obj) {
+void NetworkMessageObserver::OnNetworkManagerChanged(NetworkLibrary* obj) {
   const WifiNetworkVector& wifi_networks = obj->wifi_networks();
   const CellularNetworkVector& cellular_networks = obj->cellular_networks();
 
   NetworkConfigView* view = NULL;
   std::string new_failed_network;
   // Check to see if we have any newly failed wifi network.
   for (WifiNetworkVector::const_iterator it = wifi_networks.begin();
        it < wifi_networks.end(); it++) {
     const WifiNetwork* wifi = *it;
     if (wifi->failed()) {
@@ skipping 64 matching lines @@
     notification_connection_error_.Show(l10n_util::GetStringFUTF16(
         IDS_NETWORK_CONNECTION_ERROR_MESSAGE,
         ASCIIToUTF16(new_failed_network)), false, false);
   }
 
   // Show login box if necessary.
   if (view && initialized_)
     CreateModalPopup(view);
 }
 
-void NetworkMessageObserver::CellularDataPlanChanged(NetworkLibrary* obj) {
+void NetworkMessageObserver::OnCellularDataPlanChanged(NetworkLibrary* obj) {
   const CellularNetwork* cellular = obj->cellular_network();
   if (!cellular)
     return;
   // Active plan is the first one in the list. Use empty one if none found.
   const CellularDataPlanVector& plans = cellular->GetDataPlans();
   CellularDataPlan plan = plans.empty() ? CellularDataPlan() : plans[0];
   // If connected cellular network changed, or data plan is different, then
   // it's a new network. Then hide all previous notifications.
   bool new_plan = false;
   if (cellular->service_path() != cellular_service_path_) {
@@ skipping 54 matching lines @@
       // Got data, so hide notifications.
       notification_low_data_.Hide();
       notification_no_data_.Hide();
     }
   }
 
   cellular_data_plan_ = plan;
 }
 
 }  // namespace chromeos