chrome/browser/ui/webui/chromeos/network_config_message_handler.cc - Issue 509643003: Use GetManagedProperties in InternetOptionsHandler

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/ui/webui/chromeos/network_config_message_handler.cc

Issue 509643003: Use GetManagedProperties in InternetOptionsHandler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_279351_internet_options_8a

Patch Set: Feedback Created 6 years, 3 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

« chrome/browser/resources/options/chromeos/internet_detail.js ('K') | « chrome/browser/resources/options/chromeos/internet_detail.js ('k') | chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc » ('j') | chromeos/network/onc/onc_translator_shill_to_onc.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/network_config_message_handler.cc

diff --git a/chrome/browser/ui/webui/chromeos/network_config_message_handler.cc b/chrome/browser/ui/webui/chromeos/network_config_message_handler.cc

index 98452a86a5ccc08e0248d82182782ef7338fed46..ec5833ede6cc7d2e8a5889ca205278408d1b0c50 100644

--- a/chrome/browser/ui/webui/chromeos/network_config_message_handler.cc

+++ b/chrome/browser/ui/webui/chromeos/network_config_message_handler.cc

@@ -200,6 +200,15 @@ void NetworkConfigMessageHandler::GetShillPropertiesSuccess(

base::DictionaryValue* device_dictionary =

device_state->properties().DeepCopy();

dictionary_copy->Set(shill::kDeviceProperty, device_dictionary);

+ // Convert IPConfig dictionary to a ListValue.

+ base::ListValue* ip_configs = new base::ListValue;

+ for (base::DictionaryValue::Iterator iter(device_state->ip_configs());

+ !iter.IsAtEnd(); iter.Advance()) {

+ ip_configs->Append(iter.value().DeepCopy());

+ }

+ device_dictionary->SetWithoutPathExpansion(

+ shill::kIPConfigsProperty, ip_configs);

}

base::ListValue return_arg_list;