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

Unified Diff: chrome/browser/chromeos/cros/network_library_impl_stub.cc

Issue 10827283: This updates the StaticIP configuration UI to match new mocks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit test Created 8 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: chrome/browser/chromeos/cros/network_library_impl_stub.cc
diff --git a/chrome/browser/chromeos/cros/network_library_impl_stub.cc b/chrome/browser/chromeos/cros/network_library_impl_stub.cc
index 81288c7df67f58ac83c11ad8d5ae15d7b16d4a46..ad5d8dfc20fffe1f4a70606f86026d183191667f 100644
--- a/chrome/browser/chromeos/cros/network_library_impl_stub.cc
+++ b/chrome/browser/chromeos/cros/network_library_impl_stub.cc
@@ -675,8 +675,34 @@ NetworkIPConfigVector NetworkLibraryImplStub::GetIPConfigs(
return ip_configs_;
}
-void NetworkLibraryImplStub::SetIPConfig(const NetworkIPConfig& ipconfig) {
- ip_configs_.push_back(ipconfig);
+void NetworkLibraryImplStub::SetIPParameters(const std::string& service_path,
+ const std::string& address,
+ const std::string& netmask,
+ const std::string& gateway,
+ const std::string& name_servers,
+ int dhcp_usage_mask) {
+ VLOG(1) << "Setting IP parameters:"
+ << "\n address: " << address
+ << (dhcp_usage_mask & USE_DHCP_ADDRESS ?
+ " (ignored)" : " (in use)")
+ << "\n netmask: " << netmask
+ << (dhcp_usage_mask & USE_DHCP_NETMASK ?
+ " (ignored)" : " (in use)")
+ << "\n gateway: " << gateway
+ << (dhcp_usage_mask & USE_DHCP_GATEWAY ?
+ " (ignored)" : " (in use)")
+ << "\n name_servers: " << name_servers
+ << (dhcp_usage_mask & USE_DHCP_NAME_SERVERS ?
+ " (ignored)" : " (in use)");
+
+ Network* network = FindNetworkByPath(service_path);
+ if (network)
+ ip_configs_.push_back(NetworkIPConfig(network->device_path(),
+ IPCONFIG_TYPE_IPV4,
+ address,
+ netmask,
+ gateway,
+ name_servers));
}
} // namespace chromeos
« no previous file with comments | « chrome/browser/chromeos/cros/network_library_impl_stub.h ('k') | chrome/browser/chromeos/cros/network_library_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698