chromeos/network/onc/onc_translator_shill_to_onc.cc - Issue 571123002: Fix some properties on the settings page read from ONC.

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/onc/onc_translator_shill_to_onc.cc

Issue 571123002: Fix some properties on the settings page read from ONC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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') | « chromeos/network/onc/onc_translation_tables.cc ('k') | chromeos/test/data/network/cellular.onc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromeos/network/onc/onc_translator_shill_to_onc.cc

diff --git a/chromeos/network/onc/onc_translator_shill_to_onc.cc b/chromeos/network/onc/onc_translator_shill_to_onc.cc

index d7bc265e0ceeb9de0d75f9f703239e96c2a6a3e9..a656e5a372088f046e636c5c95113a842f9a67df 100644

--- a/chromeos/network/onc/onc_translator_shill_to_onc.cc

+++ b/chromeos/network/onc/onc_translator_shill_to_onc.cc

@@ -393,7 +393,9 @@ void ShillToONCTranslator::TranslateNetworkWithState() {

if (!onc_network_type.empty()) {

onc_object_->SetStringWithoutPathExpansion(::onc::network_config::kType,

onc_network_type);

- TranslateAndAddNestedObject(onc_network_type);

+ // Wimax is not supported by ONC, yet.

stevenjb 2014/09/15 16:38:41 Let's make sure there is a big TODO here, even if

pneubeck (no reviews) 2014/09/15 20:27:13 Done.

+ if (onc_network_type != ::onc::network_type::kWimax)

+ TranslateAndAddNestedObject(onc_network_type);

}

// Since Name is a read only field in Shill unless it's a VPN, it is copied