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

Unified Diff: chromeos/dbus/shill_service_client_stub.cc

Issue 12634019: NetworkChangeNotifierChromeos: Handle IPConfig property changes on the default network (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 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/dbus/shill_service_client_stub.h ('k') | chromeos/network/network_change_notifier_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/shill_service_client_stub.cc
diff --git a/chromeos/dbus/shill_service_client_stub.cc b/chromeos/dbus/shill_service_client_stub.cc
index 0a380bc2600a09e91f52fd15c452317d7ef4f718..3b8f1de0e7eee46dc2b9deadbaed18990fffff43 100644
--- a/chromeos/dbus/shill_service_client_stub.cc
+++ b/chromeos/dbus/shill_service_client_stub.cc
@@ -254,6 +254,17 @@ void ShillServiceClientStub::AddService(const std::string& service_path,
const std::string& type,
const std::string& state,
bool add_to_watch_list) {
+ AddServiceWithIPConfig(service_path, name, type, state, "",
+ add_to_watch_list);
+}
+
+void ShillServiceClientStub::AddServiceWithIPConfig(
+ const std::string& service_path,
+ const std::string& name,
+ const std::string& type,
+ const std::string& state,
+ const std::string& ipconfig_path,
+ bool add_to_watch_list) {
DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
AddService(service_path, add_to_watch_list);
@@ -271,6 +282,10 @@ void ShillServiceClientStub::AddService(const std::string& service_path,
properties->SetWithoutPathExpansion(
flimflam::kStateProperty,
base::Value::CreateStringValue(state));
+ if (!ipconfig_path.empty())
+ properties->SetWithoutPathExpansion(
+ shill::kIPConfigProperty,
+ base::Value::CreateStringValue(ipconfig_path));
}
void ShillServiceClientStub::RemoveService(const std::string& service_path) {
« no previous file with comments | « chromeos/dbus/shill_service_client_stub.h ('k') | chromeos/network/network_change_notifier_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698