Suppress error notifications and detailed view during OOBE

ash/system/chromeos/network/network_state_notifier.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 "ash/system/chromeos/network/network_state_notifier.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/system/chromeos/network/network_observer.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "base/command_line.h"
 #include "base/string16.h"
+#include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chromeos/network/network_event_log.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "grit/ash_strings.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using chromeos::NetworkState;
 using chromeos::NetworkStateHandler;
@@ skipping 65 matching lines @@
         IDS_CHROMEOS_NETWORK_ERROR_IPSEC_PSK_AUTH_FAILED);
   }
   if (error == flimflam::kErrorIpsecCertAuthFailed) {
     return l10n_util::GetStringUTF16(
         IDS_CHROMEOS_NETWORK_ERROR_IPSEC_CERT_AUTH_FAILED);
   }
   if (error == flimflam::kErrorPppAuthFailed) {
     return l10n_util::GetStringUTF16(
         IDS_CHROMEOS_NETWORK_ERROR_PPP_AUTH_FAILED);
   }
-  if (error == flimflam::kUnknownString)
+  if (StringToLowerASCII(error) ==
+      StringToLowerASCII(std::string(flimflam::kUnknownString))) {

[stevenjb, 2013/03/22 23:21:06]

Shill uses both UNKNOWN and Unknown, so do a case insensitive compare here.

     return l10n_util::GetStringUTF16(IDS_CHROMEOS_NETWORK_ERROR_UNKNOWN);
-  return l10n_util::GetStringUTF16(IDS_CHROMEOS_NETWORK_STATE_UNRECOGNIZED);
+  }
+  return l10n_util::GetStringFUTF16(IDS_NETWORK_UNRECOGNIZED_ERROR,
+                                    UTF8ToUTF16(error));

[stevenjb, 2013/03/22 23:21:06]

In the case of an actual unrecognized error (shouldn't actually happen), better
to show the Shill string which may or may not be helpful.

 }
 
 }  // namespace
 
 namespace ash {
 namespace internal {
 
 NetworkStateNotifier::NetworkStateNotifier()
     : cellular_out_of_credits_(false) {
   if (!NetworkStateHandler::Get())
@@ skipping 125 matching lines @@
     cached_state_[network->path()] = network->connection_state();
   }
   const NetworkState* default_network =
       NetworkStateHandler::Get()->DefaultNetwork();
   if (default_network)
     last_default_network_ = default_network->path();
 }
 
 }  // namespace internal
 }  // namespace ash