chromeos/network/policy_applicator.cc - Issue 552113002: Add ONC 'Source' configuration property

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/policy_applicator.cc

Issue 552113002: Add ONC 'Source' configuration property (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_279351_internet_options_9a

Patch Set: Rebase, Feedback, add *Policy sources 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

« chromeos/network/onc/onc_translator_shill_to_onc.cc ('K') | « chromeos/network/onc/onc_translator_unittest.cc ('k') | chromeos/test/data/network/shill_cellular_with_state.json » ('j') | components/onc/docs/onc_spec.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromeos/network/policy_applicator.cc

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

index bd81d7db1fc2bca84c616a14d244e4f8570b5219..8141bf4cedcd067740792c5bed6fe73b706d647c 100644

--- a/chromeos/network/policy_applicator.cc

+++ b/chromeos/network/policy_applicator.cc

@@ -110,9 +110,14 @@ void PolicyApplicator::GetEntryCallback(

VLOG(2) << "Received properties for entry " << entry << " of profile "

<< profile_.ToDebugString();

+ scoped_ptr<NetworkUIData> ui_data =

+ shill_property_util::GetUIDataFromProperties(entry_properties);

+ ::onc::ONCSource onc_source =

+ ui_data ? ui_data->onc_source() : ::onc::ONC_SOURCE_NONE;

scoped_ptr<base::DictionaryValue> onc_part(

- onc::TranslateShillServiceToONCPart(entry_properties,

- &onc::kNetworkWithStateSignature));

+ onc::TranslateShillServiceToONCPart(

+ entry_properties, onc_source, &onc::kNetworkWithStateSignature));

std::string old_guid;

if (!onc_part->GetStringWithoutPathExpansion(::onc::network_config::kGUID,

@@ -123,8 +128,6 @@ void PolicyApplicator::GetEntryCallback(

// unmanaged.

}

- scoped_ptr<NetworkUIData> ui_data =

- shill_property_util::GetUIDataFromProperties(entry_properties);

if (!ui_data) {

VLOG(1) << "Entry " << entry << " of profile " << profile_.ToDebugString()

<< " contains no or no valid UIData.";