chrome/browser/chromeos/cros/network_library_impl_base.cc - Issue 13454006: Moving ManagedNetworkConfigurationHandler to chromeos/.

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/cros/network_library_impl_base.cc

Issue 13454006: Moving ManagedNetworkConfigurationHandler to chromeos/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Cleaned up parsing of NetworkUIData. Created 7 years, 8 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:

Index: chrome/browser/chromeos/cros/network_library_impl_base.cc

diff --git a/chrome/browser/chromeos/cros/network_library_impl_base.cc b/chrome/browser/chromeos/cros/network_library_impl_base.cc

index 6a67fe61a54d2c0ce2899ae62289f1907756cde7..e41297186faa18e7432e9c488deeb656a672a621 100644

--- a/chrome/browser/chromeos/cros/network_library_impl_base.cc

+++ b/chrome/browser/chromeos/cros/network_library_impl_base.cc

@@ -14,6 +14,7 @@

#include "chrome/browser/chromeos/login/user_manager.h"

#include "chrome/browser/chromeos/net/onc_utils.h"

#include "chrome/browser/chromeos/network_login_observer.h"

+#include "chromeos/network/network_ui_data.h"

#include "chromeos/network/onc/onc_certificate_importer.h"

#include "chromeos/network/onc/onc_constants.h"

#include "chromeos/network/onc/onc_normalizer.h"

@@ -1237,7 +1238,7 @@ bool NetworkLibraryImplBase::LoadOncNetworks(

// Set the UIData.

scoped_ptr<NetworkUIData> ui_data =

- onc::CreateUIData(source, *normalized_network);

+ chromeos::CreateUIDataFromONC(source, *normalized_network);

base::DictionaryValue ui_data_dict;

ui_data->FillDictionary(&ui_data_dict);

std::string ui_data_json;