diff options
author | mihaip@chromium.org <mihaip@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-30 21:22:22 +0000 |
---|---|---|
committer | mihaip@chromium.org <mihaip@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-30 21:22:22 +0000 |
commit | 4e941444e96c7c1748456ea7643d91829f1ccc4f (patch) | |
tree | e4cf769360bf37583c1c20efd373acedf6e9cfd0 /chrome/browser/ui/webui/net_internals/net_internals_ui.cc | |
parent | 69353119ad3b0266db545d0f0203c235bec6589f (diff) | |
download | chromium_src-4e941444e96c7c1748456ea7643d91829f1ccc4f.zip chromium_src-4e941444e96c7c1748456ea7643d91829f1ccc4f.tar.gz chromium_src-4e941444e96c7c1748456ea7643d91829f1ccc4f.tar.bz2 |
Revert 129915 - This adds a dialog that allows the user to enroll a certificate
when they try to connect to a network that uses a certificate pattern.
It opens a modal dialog with a website (configured from ONC) where
they are able to obtain a new network certificate.
BUG=chromium-os:19409
TEST=Ran on device and on chrome for chromeos on linux.
Review URL: https://chromiumcodereview.appspot.com/9809008
TBR=gspencer@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9963031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129939 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui/net_internals/net_internals_ui.cc')
-rw-r--r-- | chrome/browser/ui/webui/net_internals/net_internals_ui.cc | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc index 4d77bf8..6acd13c 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc @@ -1255,16 +1255,9 @@ void NetInternalsMessageHandler::OnImportONCFile(const ListValue* list) { } std::string error; - chromeos::NetworkLibrary* cros_network = - chromeos::CrosLibrary::Get()->GetNetworkLibrary(); - cros_network->LoadOncNetworks(onc_blob, passcode, - chromeos::NetworkUIData::ONC_SOURCE_USER_IMPORT, - &error); - - // Now that we've added the networks, we need to rescan them so they'll be - // available from the menu more immediately. - cros_network->RequestNetworkScan(); - + chromeos::CrosLibrary::Get()->GetNetworkLibrary()-> + LoadOncNetworks(onc_blob, passcode, + chromeos::NetworkUIData::ONC_SOURCE_USER_IMPORT, &error); SendJavascriptCommand("receivedONCFileParse", Value::CreateStringValue(error)); } |