chromeos/dbus/shill_manager_client_stub.cc - Issue 12634019: NetworkChangeNotifierChromeos: Handle IPConfig property changes on the default network

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chromeos/dbus/shill_manager_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: 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

« chromeos/dbus/shill_ipconfig_client_stub.cc ('K') | « chromeos/dbus/shill_manager_client_stub.h ('k') | chromeos/dbus/shill_service_client.h » ('j') | chromeos/network/network_change_notifier_chromeos_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromeos/dbus/shill_manager_client_stub.cc

diff --git a/chromeos/dbus/shill_manager_client_stub.cc b/chromeos/dbus/shill_manager_client_stub.cc

index 8681baf0c80ecd28ea80a67414585c605e2af15e..c217de826451d0c2f75f3ef1683087f8879cbd6e 100644

--- a/chromeos/dbus/shill_manager_client_stub.cc

+++ b/chromeos/dbus/shill_manager_client_stub.cc

@@ -176,8 +176,12 @@ void ShillManagerClientStub::ConfigureService(

return;

}

+ std::string ipconfig_path;

+ properties.GetString(shill::kIPConfigProperty, &ipconfig_path);

// Add the service to the service client stub if not already there.

- service_client->AddService(guid, guid, type, flimflam::kStateIdle, true);

+ service_client->AddServiceWithIPConfig(guid, guid, type, flimflam::kStateIdle,

+ ipconfig_path, true);

// Merge the new properties with existing properties, if any.

scoped_ptr<base::DictionaryValue> merged_properties;