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

Unified Diff: chromeos/network/network_state.cc

Issue 11614035: Improve NetworkStateHandler API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix TrayNetworkStateObserver Created 8 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: chromeos/network/network_state.cc
diff --git a/chromeos/network/network_state.cc b/chromeos/network/network_state.cc
index c87bdcb4763c9fdef56f09f60e16360a7e83b9d1..8441eeebbc8d735db830e98e1fe1157aca9f6841 100644
--- a/chromeos/network/network_state.cc
+++ b/chromeos/network/network_state.cc
@@ -9,6 +9,10 @@
namespace chromeos {
+const char NetworkState::kMatchTypeDefault[] = "default";
+const char NetworkState::kMatchTypeWireless[] = "wireless";
+const char NetworkState::kMatchTypeNonVirtual[] = "non-virtual";
+
NetworkState::NetworkState(const std::string& path)
: ManagedState(MANAGED_TYPE_NETWORK, path),
signal_strength_(0) {
@@ -49,6 +53,15 @@ bool NetworkState::IsConnectingState() const {
return StateIsConnecting(state_);
}
+bool NetworkState::MatchesType(const std::string& match_type) const {
+ return ((match_type == kMatchTypeDefault) ||
+ (match_type == type()) ||
+ (match_type == kMatchTypeNonVirtual &&
+ type() != flimflam::kTypeVPN) ||
+ (match_type == kMatchTypeWireless &&
+ type() != flimflam::kTypeEthernet && type() != flimflam::kTypeVPN));
+}
+
// static
bool NetworkState::StateIsConnected(const std::string& state) {
return (state == flimflam::kStateReady ||

Powered by Google App Engine
This is Rietveld 408576698