diff options
| author | chocobo@chromium.org <chocobo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 03:51:02 +0000 |
|---|---|---|
| committer | chocobo@chromium.org <chocobo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 03:51:02 +0000 |
| commit | 21d9195836a10598ec6b5b0c31580986715791bd (patch) | |
| tree | b67a533860c7f1e352f58b058e182c0173b089f1 /chrome | |
| parent | 09233b2bb34375be923aa2906c89a80fa7e7006a (diff) | |
| download | chromium_src-21d9195836a10598ec6b5b0c31580986715791bd.zip chromium_src-21d9195836a10598ec6b5b0c31580986715791bd.tar.gz chromium_src-21d9195836a10598ec6b5b0c31580986715791bd.tar.bz2 | |
Fix infinite loop bug that crashes Chrome when selected "Disable Wifi".
BUG=chromium-os:1685
TEST=Selecting "Disable Wifi" in networm menu does not crash Chrome
Review URL: http://codereview.chromium.org/1305002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42580 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/chromeos/cros/network_library.cc | 10 | ||||
| -rw-r--r-- | chrome/browser/chromeos/cros/network_library.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc index 54e013f..cba1bb4 100644 --- a/chrome/browser/chromeos/cros/network_library.cc +++ b/chrome/browser/chromeos/cros/network_library.cc @@ -120,15 +120,15 @@ void NetworkLibraryImpl::ConnectToCellularNetwork(CellularNetwork network) { } void NetworkLibraryImpl::EnableEthernetNetworkDevice(bool enable) { - EnableNetworkDevice(TYPE_ETHERNET, enable); + EnableNetworkDeviceType(TYPE_ETHERNET, enable); } void NetworkLibraryImpl::EnableWifiNetworkDevice(bool enable) { - EnableNetworkDevice(TYPE_WIFI, enable); + EnableNetworkDeviceType(TYPE_WIFI, enable); } void NetworkLibraryImpl::EnableCellularNetworkDevice(bool enable) { - EnableNetworkDevice(TYPE_CELLULAR, enable); + EnableNetworkDeviceType(TYPE_CELLULAR, enable); } void NetworkLibraryImpl::EnableOfflineMode(bool enable) { @@ -262,8 +262,8 @@ void NetworkLibraryImpl::Init() { this); } -void NetworkLibraryImpl::EnableNetworkDevice(ConnectionType device, - bool enable) { +void NetworkLibraryImpl::EnableNetworkDeviceType(ConnectionType device, + bool enable) { if (!CrosLibrary::Get()->EnsureLoaded()) return; diff --git a/chrome/browser/chromeos/cros/network_library.h b/chrome/browser/chromeos/cros/network_library.h index 8f5b244..bb78e95 100644 --- a/chrome/browser/chromeos/cros/network_library.h +++ b/chrome/browser/chromeos/cros/network_library.h @@ -336,7 +336,7 @@ class NetworkLibraryImpl : public NetworkLibrary, void Init(); // Enables/disables the specified network device. - void EnableNetworkDevice(ConnectionType device, bool enable); + void EnableNetworkDeviceType(ConnectionType device, bool enable); // Update the network with the SystemInfo object. // This will notify all the Observers. |