Turn off network connection failure notification.

TBR=oshima
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2635008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49036 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 53 deletions

diff --git a/chrome/browser/chromeos/network_message_observer.cc b/chrome/browser/chromeos/network_message_observer.cc
index d722212..192ff28 100644
--- a/chrome/browser/chromeos/network_message_observer.cc
+++ b/chrome/browser/chromeos/network_message_observer.cc
@@ -16,23 +16,6 @@ NetworkMessageObserver::NetworkMessageObserver(Profile* profile)
   : notification_(profile, "network_connection.chromeos",
         IDR_NOTIFICATION_NETWORK_FAILED,
         l10n_util::GetStringUTF16(IDS_NETWORK_CONNECTION_ERROR_TITLE)) {
-  // On startup, we may already have failed netorks.
-  // So marked these as known failed.
-  NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
-  const WifiNetworkVector& wifi_networks = cros->wifi_networks();
-  for (WifiNetworkVector::const_iterator it = wifi_networks.begin();
-       it < wifi_networks.end(); it++) {
-    const WifiNetwork& wifi = *it;
-    if (wifi.failed())
-      failed_networks_.insert(wifi.name());
-  }
-  const CellularNetworkVector& cellular_networks = cros->cellular_networks();
-  for (CellularNetworkVector::const_iterator it = cellular_networks.begin();
-       it < cellular_networks.end(); it++) {
-    const CellularNetwork& cellular = *it;
-    if (cellular.failed())
-      failed_networks_.insert(cellular.name());
-  }
 }
 
 NetworkMessageObserver::~NetworkMessageObserver() {
@@ -40,41 +23,10 @@ NetworkMessageObserver::~NetworkMessageObserver() {
 }
 
 void NetworkMessageObserver::NetworkChanged(NetworkLibrary* obj) {
-  std::set<std::string> failed;
-  std::string new_failed_network;
-
-  // For each call to NetworkChanged, we expect at most 1 new failed network.
-  // So we just keep track of it if we find a newly failed network by comparing
-  // against or stored failed networks. And we only display notification if we
-  // find a newly failed network.
-  const WifiNetworkVector& wifi_networks = obj->wifi_networks();
-  for (WifiNetworkVector::const_iterator it = wifi_networks.begin();
-       it < wifi_networks.end(); it++) {
-    const WifiNetwork& wifi = *it;
-    if (wifi.failed()) {
-      failed.insert(wifi.name());
-      if (failed_networks_.find(wifi.name())
-          == failed_networks_.end())
-        new_failed_network = wifi.name();
-    }
-  }
-  const CellularNetworkVector& cellular_networks = obj->cellular_networks();
-  for (CellularNetworkVector::const_iterator it = cellular_networks.begin();
-       it < cellular_networks.end(); it++) {
-    const CellularNetwork& cellular = *it;
-    if (cellular.failed()) {
-      failed.insert(cellular.name());
-      if (failed_networks_.find(cellular.name())
-          == failed_networks_.end())
-        new_failed_network = cellular.name();
-    }
-  }
-
-  failed_networks_ = failed;
-  if (!new_failed_network.empty())
-    notification_.Show(l10n_util::GetStringFUTF16(
-        IDS_NETWORK_CONNECTION_ERROR_MESSAGE,
-        ASCIIToUTF16(new_failed_network)), true);
+  // TODO(chocobo): Display open networks notification here.
+//    notification_.Show(l10n_util::GetStringFUTF16(
+//        IDS_NETWORK_CONNECTION_ERROR_MESSAGE,
+//        ASCIIToUTF16(network.name())), true);
 }
 
 }  // namespace chromeos
diff --git a/chrome/browser/chromeos/network_message_observer.h b/chrome/browser/chromeos/network_message_observer.h
index 3834cc3..a62e636 100644
--- a/chrome/browser/chromeos/network_message_observer.h
+++ b/chrome/browser/chromeos/network_message_observer.h
@@ -29,7 +29,6 @@ class NetworkMessageObserver : public NetworkLibrary::Observer {
   virtual void NetworkTraffic(NetworkLibrary* obj, int traffic_type) {}
 
   SystemNotification notification_;
-  std::set<std::string> failed_networks_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkMessageObserver);
 };