chrome/browser/chromeos/net/managed_network_configuration_handler.cc - Issue 12319145: Using the new Network*Handlers in networkingPrivate Extension API.

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: chrome/browser/chromeos/net/managed_network_configuration_handler.cc

Issue 12319145: Using the new Network*Handlers in networkingPrivate Extension API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased and updated new browser test setup. 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 | « chrome/browser/chromeos/extensions/networking_private_apitest.cc ('k') | chrome/browser/chromeos/system/ash_system_tray_delegate.cc » ('j') | chromeos/network/network_state.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/net/managed_network_configuration_handler.cc

diff --git a/chrome/browser/chromeos/net/managed_network_configuration_handler.cc b/chrome/browser/chromeos/net/managed_network_configuration_handler.cc

index 27ea5fadea447d672a819b11ce208a3a27c21b0f..297265cf3ef139249084560b5c040b7e2fc14725 100644

--- a/chrome/browser/chromeos/net/managed_network_configuration_handler.cc

+++ b/chrome/browser/chromeos/net/managed_network_configuration_handler.cc

@@ -64,7 +64,7 @@ void TranslatePropertiesAndRunCallback(

scoped_ptr<base::DictionaryValue> onc_network(

onc::TranslateShillServiceToONCPart(

shill_properties,

- &onc::kNetworkConfigurationSignature));

+ &onc::kNetworkWithStateSignature));

callback.Run(service_path, *onc_network);

}

@@ -130,9 +130,8 @@ void ManagedNetworkConfigurationHandler::SetProperties(

// TODO(pneubeck): Enforce policies.

scoped_ptr<base::DictionaryValue> shill_dictionary(

- onc::TranslateONCObjectToShill(

- &onc::kNetworkConfigurationSignature,

- properties));

+ onc::TranslateONCObjectToShill(&onc::kNetworkConfigurationSignature,

+ properties));

NetworkConfigurationHandler::Get()->SetProperties(service_path,

*shill_dictionary,