diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 04:17:30 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 04:17:30 +0000 |
| commit | 0487fd9c189d6a9684ea8df076dab6e7394a2d55 (patch) | |
| tree | c3af573e1bf3dbefb63840a4a997a5fdbfced01a | |
| parent | 288ddd812295aa4dea37e6599c2ca035cff0d632 (diff) | |
| download | chromium_src-0487fd9c189d6a9684ea8df076dab6e7394a2d55.zip chromium_src-0487fd9c189d6a9684ea8df076dab6e7394a2d55.tar.gz chromium_src-0487fd9c189d6a9684ea8df076dab6e7394a2d55.tar.bz2 | |
chromeos: Remove the auto_connect argument from ConnectToNetworkAt() function.
R=stevenjb@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11369037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165614 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/status/network_menu.cc | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc index b26d16d..6ef7c9a 100644 --- a/chrome/browser/chromeos/status/network_menu.cc +++ b/chrome/browser/chromeos/status/network_menu.cc @@ -131,11 +131,7 @@ class NetworkMenuModel : public ui::MenuModel { virtual ~NetworkMenuModel() {} // Connect or reconnect to the network at |index|. - // If remember >= 0, set the favorite state of the network. - void ConnectToNetworkAt(int index, - const std::string& passphrase, - const std::string& ssid, - int remember) const; + void ConnectToNetworkAt(int index); // Called by NetworkMenu::UpdateMenu to initialize menu items. virtual void InitMenuItems(bool should_open_button_options) = 0; @@ -269,19 +265,13 @@ class MainMenuModel : public NetworkMenuModel { //////////////////////////////////////////////////////////////////////////////// // NetworkMenuModel, public methods: -void NetworkMenuModel::ConnectToNetworkAt(int index, - const std::string& passphrase, - const std::string& ssid, - int auto_connect) const { +void NetworkMenuModel::ConnectToNetworkAt(int index) { int flags = menu_items_[index].flags; NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary(); const std::string& service_path = menu_items_[index].service_path; if (flags & FLAG_WIFI) { WifiNetwork* wifi = cros->FindWifiNetworkByPath(service_path); if (wifi) { - // Connect or reconnect. - if (auto_connect >= 0) - wifi->SetAutoConnect(auto_connect ? true : false); owner_->ConnectToNetwork(wifi); } else { // If we are attempting to connect to a network that no longer exists, @@ -435,7 +425,7 @@ void NetworkMenuModel::ActivatedAt(int index) { FLAG_WIMAX | FLAG_CELLULAR | FLAG_ADD_CELLULAR | FLAG_VPN | FLAG_ADD_VPN)) { - ConnectToNetworkAt(index, std::string(), std::string(), -1); + ConnectToNetworkAt(index); } else if (flags & FLAG_DISCONNECT_VPN) { const VirtualNetwork* active_vpn = cros->virtual_network(); if (active_vpn) |