diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-28 19:20:14 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-28 19:20:14 +0000 |
| commit | 2ebb9caca2140d3a38e52820a588cbf0bb52fdfb (patch) | |
| tree | 9817442693c0ae86d0ae7b9e36dc8c348d35c659 /chrome/browser/chromeos/cros/network_library.cc | |
| parent | ad6ded2b4dd0e36db346a085bd2538307aab1f36 (diff) | |
| download | chromium_src-2ebb9caca2140d3a38e52820a588cbf0bb52fdfb.zip chromium_src-2ebb9caca2140d3a38e52820a588cbf0bb52fdfb.tar.gz chromium_src-2ebb9caca2140d3a38e52820a588cbf0bb52fdfb.tar.bz2 | |
Clear UI data upon deleting remembered networks.
BUG=chromium-os:19411
TEST=Configure policy-pushed WiFi network which is in range, then remove it again. The network should return to not policy controlled in the available networks list.
Review URL: http://codereview.chromium.org/8989059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115905 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/cros/network_library.cc')
| -rw-r--r-- | chrome/browser/chromeos/cros/network_library.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc index f69b7e4..3db2879 100644 --- a/chrome/browser/chromeos/cros/network_library.cc +++ b/chrome/browser/chromeos/cros/network_library.cc @@ -574,6 +574,11 @@ void Network::SetSaveCredentials(bool save_credentials) { flimflam::kSaveCredentialsProperty, save_credentials, &save_credentials_); } +void Network::ClearUIData() { + ui_data_.Clear(); + ClearProperty(flimflam::kUIDataProperty); +} + void Network::SetProfilePath(const std::string& profile_path) { VLOG(1) << "Setting profile for: " << name_ << " to: " << profile_path; SetOrClearStringProperty( @@ -3159,6 +3164,7 @@ void NetworkLibraryImplBase::DeleteRememberedNetwork( if (network) { // Clear the stored credentials for any forgotten networks. network->EraseCredentials(); + network->ClearUIData(); SetProfileType(network, PROFILE_NONE); // Remove VPN from list of networks. if (network->type() == TYPE_VPN) |