chromeos/network/managed_network_configuration_handler_impl.cc - Issue 1779633002: Invoke createNetwork() callback with GUID, not service name

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/network/managed_network_configuration_handler_impl.cc

Issue 1779633002: Invoke createNetwork() callback with GUID, not service name (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix more trybot failures Created 4 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/network/managed_network_configuration_handler_impl.h ('k') | chromeos/network/mock_managed_network_configuration_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromeos/network/managed_network_configuration_handler_impl.cc

diff --git a/chromeos/network/managed_network_configuration_handler_impl.cc b/chromeos/network/managed_network_configuration_handler_impl.cc

index cdbc9638ea344416b0c3f980e024fed7c5c804de..4574f7781a2762387ab0f97d901736471980c47c 100644

--- a/chromeos/network/managed_network_configuration_handler_impl.cc

+++ b/chromeos/network/managed_network_configuration_handler_impl.cc

@@ -358,7 +358,7 @@ void ManagedNetworkConfigurationHandlerImpl::SetShillProperties(

void ManagedNetworkConfigurationHandlerImpl::CreateConfiguration(

const std::string& userhash,

const base::DictionaryValue& properties,

- const network_handler::StringResultCallback& callback,

+ const network_handler::ServiceResultCallback& callback,

const network_handler::ErrorCallback& error_callback) const {

const Policies* policies = GetPoliciesForUser(userhash);

if (!policies) {

@@ -735,7 +735,8 @@ void ManagedNetworkConfigurationHandlerImpl::Init(

}

void ManagedNetworkConfigurationHandlerImpl::OnPolicyAppliedToNetwork(

- const std::string& service_path) {

+ const std::string& service_path,

+ const std::string& guid) {

if (service_path.empty())

return;

FOR_EACH_OBSERVER(