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

Unified Diff: chromeos/network/network_state_handler.h

Issue 23712002: Cleanup network type matching. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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/network_state_handler.h
diff --git a/chromeos/network/network_state_handler.h b/chromeos/network/network_state_handler.h
index 3ae71262a649c6c96da3cd08fe70bd7368870312..c404fa1b1d8a9dcff648a596cfdfea48e8235911 100644
--- a/chromeos/network/network_state_handler.h
+++ b/chromeos/network/network_state_handler.h
@@ -48,11 +48,12 @@ class NetworkStateHandlerTest;
// It will invoke its own more specific observer methods when the specified
// changes occur.
//
-// Most *ByType or *ForType methods will accept any of the following for
-// |type|. See individual methods for specific notes.
+// Most *ByType or *ForType methods will accept any of the following for |type|.
+// See individual methods for specific notes.
// * Any type defined in service_constants.h (e.g. flimflam::kTypeWifi)
// * kMatchTypeDefault returns the default (active) network
// * kMatchTypeNonVirtual returns the primary non virtual network
+// * kMatchTypeWired returns the primary wired network
// * kMatchTypeWireless returns the primary wireless network
// * kMatchTypeMobile returns the primary cellular or wimax network
@@ -85,8 +86,8 @@ class CHROMEOS_EXPORT NetworkStateHandler
// called any time a new service is configured or a Profile is loaded.
void UpdateManagerProperties();
- // Returns the state for technology |type|. kMatchTypeMobile (only) is
- // also supported.
+ // Returns the state for technology |type|. kMatchTypeMobile and
+ // kMatchTypeWired (and no other kMatchType*) are also supported.
TechnologyState GetTechnologyState(const std::string& type) const;
bool IsTechnologyAvailable(const std::string& type) const {
return GetTechnologyState(type) != TECHNOLOGY_UNAVAILABLE;
@@ -96,7 +97,8 @@ class CHROMEOS_EXPORT NetworkStateHandler
}
// Asynchronously sets the technology enabled property for |type|.
- // kMatchTypeMobile (only) is also supported.
+ // kMatchTypeMobile and kMatchTypeWired (and no other kMatchType*) are also
+ // supported.
// Note: Modifies Manager state. Calls |error_callback| on failure.
void SetTechnologyEnabled(
const std::string& type,
@@ -206,6 +208,7 @@ class CHROMEOS_EXPORT NetworkStateHandler
static NetworkStateHandler* InitializeForTest();
static const char kMatchTypeDefault[];
+ static const char kMatchTypeWired[];
static const char kMatchTypeWireless[];
static const char kMatchTypeMobile[];
static const char kMatchTypeNonVirtual[];

Powered by Google App Engine
This is Rietveld 408576698