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

Unified Diff: chromeos/network/favorite_state.h

Issue 21046008: Convert all connect code to use NetworkHandler instead of NetworkLibrary (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Restore check VPN PassphraseRequred Created 7 years, 5 months 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: chromeos/network/favorite_state.h
diff --git a/chromeos/network/favorite_state.h b/chromeos/network/favorite_state.h
index 4fa03f3707af03ab6b14b825252b5740fd2cdf04..53f92811c58c00550cebabb243df823ab0031714 100644
--- a/chromeos/network/favorite_state.h
+++ b/chromeos/network/favorite_state.h
@@ -6,6 +6,7 @@
#define CHROMEOS_NETWORK_FAVORITE_STATE_H_
#include "chromeos/network/managed_state.h"
+#include "chromeos/network/network_ui_data.h"
#include "chromeos/network/onc/onc_constants.h"
namespace chromeos {
@@ -30,7 +31,7 @@ class CHROMEOS_EXPORT FavoriteState : public ManagedState {
// Accessors
const std::string& profile_path() const { return profile_path_; }
bool is_favorite() const { return !profile_path_.empty(); }
- onc::ONCSource onc_source() const { return onc_source_; }
+ const NetworkUIData& ui_data() const { return ui_data_; }
// Returns true if the ONC source is a device or user policy.
bool IsManaged() const;
@@ -40,7 +41,7 @@ class CHROMEOS_EXPORT FavoriteState : public ManagedState {
private:
std::string profile_path_;
- onc::ONCSource onc_source_;
+ NetworkUIData ui_data_;
DISALLOW_COPY_AND_ASSIGN(FavoriteState);
};

Powered by Google App Engine
This is Rietveld 408576698