Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5800)

Unified Diff: chrome/browser/chromeos/cros/network_library.cc

Issue 8804020: Set onc_source UI data parameter when importing ONC. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Ken's comments. Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/cros/network_library.cc
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc
index 43acb7c23abcb03b22e1ef6645e7105301952ee3..563dc6e21c0ffac52b795526c9d9f1b50a69901b 100644
--- a/chrome/browser/chromeos/cros/network_library.cc
+++ b/chrome/browser/chromeos/cros/network_library.cc
@@ -31,7 +31,6 @@
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "chrome/browser/chromeos/cros/native_network_constants.h"
#include "chrome/browser/chromeos/cros/native_network_parser.h"
-#include "chrome/browser/chromeos/cros/network_ui_data.h"
#include "chrome/browser/chromeos/cros/onc_network_parser.h"
#include "chrome/browser/chromeos/cros_settings.h"
#include "chrome/browser/chromeos/network_login_observer.h"
@@ -1745,7 +1744,8 @@ class NetworkLibraryImplBase : public NetworkLibrary {
// virtual SetIPConfig implemented in derived classes.
virtual void SwitchToPreferredNetwork() OVERRIDE;
virtual bool LoadOncNetworks(const std::string& onc_blob,
- const std::string& passcode) OVERRIDE;
+ const std::string& passcode,
+ NetworkUIData::ONCSource source) OVERRIDE;
virtual bool SetActiveNetwork(ConnectionType type,
const std::string& service_path) OVERRIDE;
@@ -2834,9 +2834,10 @@ void NetworkLibraryImplBase::SwitchToPreferredNetwork() {
}
bool NetworkLibraryImplBase::LoadOncNetworks(const std::string& onc_blob,
- const std::string& passcode) {
+ const std::string& passcode,
+ NetworkUIData::ONCSource source) {
// TODO(gspencer): Add support for decrypting onc files. crbug.com/19397
- OncNetworkParser parser(onc_blob);
+ OncNetworkParser parser(onc_blob, source);
for (int i = 0; i < parser.GetCertificatesSize(); i++) {
// Insert each of the available certs into the certificate DB.
@@ -5102,7 +5103,7 @@ void NetworkLibraryImplStub::Init() {
" ],"
" \"Certificates\": []"
"}");
- LoadOncNetworks(test_blob, "");
+ LoadOncNetworks(test_blob, "", NetworkUIData::ONC_SOURCE_USER_IMPORT);
}
////////////////////////////////////////////////////////////////////////////

Powered by Google App Engine
This is Rietveld 408576698