Only show prefer network checkbox for networks stored on user profile.

chrome/browser/chromeos/cros/network_library.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/cros/network_library.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 
@@ skipping 2658 matching lines @@
       const std::string& user_passphrase) OVERRIDE;
 
   // virtual DisconnectFromNetwork implemented in derived classes.
   virtual void ForgetNetwork(const std::string& service_path) OVERRIDE;
   virtual void EnableEthernetNetworkDevice(bool enable) OVERRIDE;
   virtual void EnableWifiNetworkDevice(bool enable) OVERRIDE;
   virtual void EnableCellularNetworkDevice(bool enable) OVERRIDE;
   // virtual EnableOfflineMode implemented in derived classes.
   // virtual GetIPConfigs implemented in derived classes.
   // virtual SetIPConfig implemented in derived classes.
+  virtual void SwitchToPreferredNetworkIfAppropriate() OVERRIDE;
 
  protected:
   typedef ObserverList<NetworkObserver> NetworkObserverList;
   typedef std::map<std::string, NetworkObserverList*> NetworkObserverMap;
 
   typedef ObserverList<NetworkDeviceObserver> NetworkDeviceObserverList;
   typedef std::map<std::string, NetworkDeviceObserverList*>
       NetworkDeviceObserverMap;
 
   typedef std::map<std::string, Network*> NetworkMap;
@@ skipping 1048 matching lines @@
     return;
   CallEnableNetworkDeviceType(TYPE_WIFI, enable);
 }
 
 void NetworkLibraryImplBase::EnableCellularNetworkDevice(bool enable) {
   if (is_locked_)
     return;
   CallEnableNetworkDeviceType(TYPE_CELLULAR, enable);
 }
 
+void NetworkLibraryImplBase::SwitchToPreferredNetworkIfAppropriate() {
+  // If current network (if any) is not preferred, check network service list to
+  // see if the first not connected network is preferred and set to autoconnect.
+  // If so, connect to it.
+  if (active_wifi_ == NULL || active_wifi_->preferred())

[stevenjb, 2011/08/03 21:37:52]

This assumes that flimflam would always auto-connect to a preferred+auto-connect
network when not already connected to a wifi network. This is probably OK, but
we might want to explain that.

Alternately, we could be more explicit here and not rely on flimflam behavior:

if (!wifi_enabled() || (active_wifi_ && active_wifi_->preferred())
  return;

[Charlie Lee, 2011/08/03 22:22:59]

Good advice. Thanks.

On 2011/08/03 21:37:52, Steven Bennetts wrote:

+    return;
+  if (wifi_networks_.empty())

[stevenjb, 2011/08/03 21:37:52]

nit: Extra check here isn't really necessary.

[Charlie Lee, 2011/08/03 22:22:59]

Done.

+    return;
+  for (WifiNetworkVector::const_iterator it = wifi_networks_.begin();
+      it != wifi_networks_.end(); ++it) {
+    WifiNetwork* wifi = *it;
+    if (wifi->connected())  // Skip connected networks.

[stevenjb, 2011/08/03 21:37:52]

|| connecting() (I don't think we can currently be connecting to one wifi
network while another is active, but that may change at some point).

[Charlie Lee, 2011/08/03 22:22:59]

Done.

+      continue;
+    if (!wifi->preferred())  // All preferred networks are sorted in front.
+      break;
+    if (wifi->auto_connect()) {
+      ConnectToWifiNetwork(wifi);
+      break;
+    }
+  }
+}
+
+
 ////////////////////////////////////////////////////////////////////////////
 // Network list management functions.
 
 // Note: sometimes flimflam still returns networks when the device type is
 // disabled. Always check the appropriate enabled() state before adding
 // networks to a list or setting an active network so that we do not show them
 // in the UI.
 
 // This relies on services being requested from flimflam in priority order,
 // and the updates getting processed and received in order.
@@ skipping 1200 matching lines @@
     case PROPERTY_INDEX_OFFLINE_MODE: {
       DCHECK_EQ(value->GetType(), Value::TYPE_BOOLEAN);
       value->GetAsBoolean(&offline_mode_);
       NotifyNetworkManagerChanged(false);  // Not forced.
       break;
     }
     case PROPERTY_INDEX_ACTIVE_PROFILE: {
       DCHECK_EQ(value->GetType(), Value::TYPE_STRING);
       value->GetAsString(&active_profile_path_);
       VLOG(1) << "Active Profile: " << active_profile_path_;
+      if (active_profile_path_ != kSharedProfilePath)

[stevenjb, 2011/08/03 21:37:52]

We should check on == kUserProfilePath; there has been some discussion of adding
additional profiles, e.g. a machine policy profile.
We probably also only want to do this check when the active profile changes,
instead of every time we request a manager update.

+        SwitchToPreferredNetworkIfAppropriate();
       break;
     }
     case PROPERTY_INDEX_PROFILES: {
       DCHECK_EQ(value->GetType(), Value::TYPE_LIST);
       const ListValue* vlist = static_cast<const ListValue*>(value);
       UpdateRememberedNetworks(vlist);
       RequestRememberedNetworksUpdate();
       break;
     }
     case PROPERTY_INDEX_SERVICES: {
@@ skipping 870 matching lines @@
   return network_library;
 }
 
 /////////////////////////////////////////////////////////////////////////////
 
 }  // namespace chromeos
 
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
 // won't be deleted until it's last InvokeLater is run.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::NetworkLibraryImplBase);