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

Unified Diff: chromeos/network/network_state_handler.cc

Issue 15899015: Add CheckPortalList manager property to NetworkStateHandler (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: force manager property update in shill manager client stub implementation Created 7 years, 7 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
« no previous file with comments | « chromeos/network/network_state_handler.h ('k') | chromeos/network/shill_property_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/network_state_handler.cc
diff --git a/chromeos/network/network_state_handler.cc b/chromeos/network/network_state_handler.cc
index 053a932e46bfbd417f134c4830a2b4407ebedce4..763c7fccaaea1a0cd54dd55a6bc1cc1b423e9d68 100644
--- a/chromeos/network/network_state_handler.cc
+++ b/chromeos/network/network_state_handler.cc
@@ -70,6 +70,8 @@ const char NetworkStateHandler::kMatchTypeDefault[] = "default";
const char NetworkStateHandler::kMatchTypeWireless[] = "wireless";
const char NetworkStateHandler::kMatchTypeMobile[] = "mobile";
const char NetworkStateHandler::kMatchTypeNonVirtual[] = "non-virtual";
+const char NetworkStateHandler::kDefaultCheckPortalList[] =
+ "ethernet,wifi,cellular";
NetworkStateHandler::NetworkStateHandler() {
}
@@ -306,6 +308,12 @@ void NetworkStateHandler::SetConnectingNetwork(
NET_LOG_ERROR("SetConnectingNetwork to unknown network", service_path);
}
+void NetworkStateHandler::SetCheckPortalList(
+ const std::string& check_portal_list) {
+ NET_LOG_EVENT("SetCheckPortalList", check_portal_list);
+ shill_property_handler_->SetCheckPortalList(check_portal_list);
+}
+
void NetworkStateHandler::GetNetworkStatePropertiesForTest(
base::DictionaryValue* dictionary) const {
for (ManagedStateList::const_iterator iter = network_list_.begin();
@@ -461,6 +469,11 @@ void NetworkStateHandler::UpdateDeviceProperty(const std::string& device_path,
ScanCompleted(device->type());
}
+void NetworkStateHandler::CheckPortalListChanged(
+ const std::string& check_portal_list) {
+ check_portal_list_ = check_portal_list;
+}
+
void NetworkStateHandler::NotifyManagerPropertyChanged() {
NET_LOG_DEBUG("NotifyManagerPropertyChanged", "");
FOR_EACH_OBSERVER(NetworkStateHandlerObserver, observers_,
« no previous file with comments | « chromeos/network/network_state_handler.h ('k') | chromeos/network/shill_property_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698