Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / webui / chromeos / login / network_state_informer.cc

diff --git a/src/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc b/src/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc
index 115f545..c352072 100644 (file)
--- a/src/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc
+++ b/src/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc
@@ -21,15 +21,21 @@ namespace chromeos {
 
 namespace {
 
+const char kNetworkStateOffline[] = "offline";
+const char kNetworkStateOnline[] = "online";
+const char kNetworkStateCaptivePortal[] = "behind captive portal";
+const char kNetworkStateConnecting[] = "connecting";
+const char kNetworkStateProxyAuthRequired[] = "proxy auth required";
+
 bool HasDefaultNetworkProxyConfigured() {
-  const FavoriteState* favorite =
-      NetworkHandler::Get()->network_state_handler()->DefaultFavoriteNetwork();
-  if (!favorite)
+  const NetworkState* network =
+      NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
+  if (!network)
     return false;
   onc::ONCSource onc_source = onc::ONC_SOURCE_NONE;
   scoped_ptr<ProxyConfigDictionary> proxy_dict =
-      proxy_config::GetProxyConfigForFavoriteNetwork(
-          NULL, g_browser_process->local_state(), *favorite, &onc_source);
+      proxy_config::GetProxyConfigForNetwork(
+          NULL, g_browser_process->local_state(), *network, &onc_source);
   ProxyPrefs::ProxyMode mode;
   return (proxy_dict && proxy_dict->GetMode(&mode) &&
           mode == ProxyPrefs::MODE_FIXED_SERVERS);
@@ -43,7 +49,7 @@ NetworkStateInformer::State GetStateForDefaultNetwork() {
 
   if (NetworkPortalDetector::Get()->IsEnabled()) {
     NetworkPortalDetector::CaptivePortalState state =
-        NetworkPortalDetector::Get()->GetCaptivePortalState(network);
+        NetworkPortalDetector::Get()->GetCaptivePortalState(network->guid());
     NetworkPortalDetector::CaptivePortalStatus status = state.status;
     if (status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN &&
         NetworkState::StateIsConnecting(network->connection_state())) {
@@ -139,9 +145,30 @@ void NetworkStateInformer::Observe(
     NOTREACHED() << "Unknown notification: " << type;
 }
 
+#if !defined(USE_ATHENA)
 void NetworkStateInformer::OnPortalDetected() {
   UpdateStateAndNotify();
 }
+#endif
+
+// static
+const char* NetworkStateInformer::StatusString(State state) {
+  switch (state) {
+    case OFFLINE:
+      return kNetworkStateOffline;
+    case ONLINE:
+      return kNetworkStateOnline;
+    case CAPTIVE_PORTAL:
+      return kNetworkStateCaptivePortal;
+    case CONNECTING:
+      return kNetworkStateConnecting;
+    case PROXY_AUTH_REQUIRED:
+      return kNetworkStateProxyAuthRequired;
+    default:
+      NOTREACHED();
+      return NULL;
+  }
+}
 
 bool NetworkStateInformer::UpdateState() {
   const NetworkState* default_network =