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

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

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.h
diff --git a/chrome/browser/chromeos/cros/network_library.h b/chrome/browser/chromeos/cros/network_library.h
index b27f4db6d5ea093161f5f5c77fa78ea91ffea5f3..ca9ac1ab07d8fd4ef598e7af1a478d258d55da49 100644
--- a/chrome/browser/chromeos/cros/network_library.h
+++ b/chrome/browser/chromeos/cros/network_library.h
@@ -18,6 +18,7 @@
#include "base/observer_list.h"
#include "base/string16.h"
#include "base/timer.h"
+#include "chrome/browser/chromeos/cros/network_ui_data.h"
#include "third_party/cros/chromeos_network.h"
namespace base {
@@ -665,6 +666,9 @@ class Network {
const DictionaryValue* ui_data() const { return &ui_data_; }
DictionaryValue* ui_data() { return &ui_data_; }
+ const DictionaryValue* onc() const { return &onc_; }
+ DictionaryValue* onc() { return &onc_; }
+
void set_notify_failure(bool state) { notify_failure_ = state; }
void SetPreferred(bool preferred);
@@ -847,6 +851,11 @@ class Network {
// stored in JSON-serialized from in the connection manager.
DictionaryValue ui_data_;
+ // This contains the ONC blob if this network was imported via ONC. This is
kmixter1 2011/12/13 19:21:03 nit: This contains the deserialized ONC blob...
Mattias Nissler (ping if slow) 2011/12/14 20:46:38 Obsolete now...
+ // currently only used for policy-configured networks to figure out which
+ // properties should be user-editable and what their default values are.
+ DictionaryValue onc_;
+
// This is the parser we use to parse messages from the native
// network layer.
scoped_ptr<NetworkParser> network_parser_;
@@ -1790,7 +1799,8 @@ class NetworkLibrary {
// Load networks from an Open Network Configuration blob.
virtual bool LoadOncNetworks(const std::string& onc_blob,
- const std::string& passcode) = 0;
+ const std::string& passcode,
+ NetworkUIData::ONCSource source) = 0;
// This sets the active network for the network type. Note: priority order
// is unchanged (i.e. if a wifi network is set to active, but an ethernet

Powered by Google App Engine
This is Rietveld 408576698