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 SwitchToPreferredNetwork() 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::SwitchToPreferredNetwork() {
+  // 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 (!wifi_enabled() || (active_wifi_ && active_wifi_->preferred()))
+    return;
+  for (WifiNetworkVector::const_iterator it = wifi_networks_.begin();
+      it != wifi_networks_.end(); ++it) {
+    WifiNetwork* wifi = *it;
+    if (wifi->connected() || wifi->connecting())  // Skip connected/connecting.
+      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)
+        SwitchToPreferredNetwork();

[stevenjb, 2011/08/03 22:58:26]

We should probably only call this when active_profile_path_ changes, and we
should check on == user instead of != shared, in case we add additional profile
types later.

[Charlie Lee, 2011/08/04 20:43:02]

What's the format of the user profile? It seems like, right now in other places,
we resort to profile type is user if profile string is not shared. So that's
what i'm doing here also.

[stevenjb, 2011/08/04 21:01:15]

Ah, I see, I didn't add a kUserProfilePath[]. We should probably replace
active_profile_path_ with active_profile_type_ and have one piece of code that
parses the path and sets the type, but this is fine for now. If we add any more
profile types we can do the refactoring then.

       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 274 matching lines @@
   // Update the list of profiles.
   profile_list_.clear();
   for (ListValue::const_iterator iter = profiles->begin();
        iter != profiles->end(); ++iter) {
     std::string profile_path;
     (*iter)->GetAsString(&profile_path);
     if (profile_path.empty()) {
       LOG(WARNING) << "Bad or empty profile path.";
       continue;
     }
     NetworkProfileType profile_type;

[Charlie Lee, 2011/08/04 20:43:02]

See this code. I assume user profile is something like /profile/user/somestring
and it was easier to just check to see if it's not the shared profile.

     if (profile_path == kSharedProfilePath)
       profile_type = PROFILE_SHARED;
     else
       profile_type = PROFILE_USER;
     profile_list_.push_back(NetworkProfile(profile_path, profile_type));
     // Check to see if we connected to any networks before a user profile was
     // available (i.e. before login), but unchecked the "Share" option (i.e.
     // the desired pofile is the user profile). Move these networks to the
     // user profile when it becomes available.
     if (profile_type == PROFILE_USER && !user_networks_.empty()) {
@@ skipping 575 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);