chrome/browser/chromeos/options/vpn_config_view.cc - Issue 14846004: Migrate ProxyConfigServiceImpl to NetworkStateHandler and NetworkProfileHandler.

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/options/vpn_config_view.cc

Issue 14846004: Migrate ProxyConfigServiceImpl to NetworkStateHandler and NetworkProfileHandler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased. Created 7 years, 7 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/net/onc_utils.cc ('k') | chrome/browser/chromeos/options/wifi_config_view.cc » ('j') | chrome/browser/chromeos/proxy_config_service_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/options/vpn_config_view.cc

diff --git a/chrome/browser/chromeos/options/vpn_config_view.cc b/chrome/browser/chromeos/options/vpn_config_view.cc

index c355e4b1598b0e4861b9b1a3c9439a1f32e9c3ac..0b989413a3f08aecfced0efe1330e8923114873e 100644

--- a/chrome/browser/chromeos/options/vpn_config_view.cc

+++ b/chrome/browser/chromeos/options/vpn_config_view.cc

@@ -8,9 +8,11 @@

#include "base/stringprintf.h"

#include "base/utf_string_conversions.h"

#include "chrome/browser/chromeos/cros/cros_library.h"

+#include "chrome/browser/chromeos/cros/network_library.h"

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

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/common/net/x509_certificate_model.h"

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

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

#include "grit/chromium_strings.h"

#include "grit/generated_resources.h"

@@ -897,7 +899,7 @@ void VPNConfigView::ParseVPNUIProperty(NetworkPropertyUIData* property_ui_data,

VLOG_IF(1, !onc) << "No ONC found for VPN network " << network->unique_id();

property_ui_data->ParseOncProperty(

- network->ui_data(), onc,

+ network->ui_data().onc_source(), onc,

base::StringPrintf("%s.%s.%s",

onc::network_config::kVPN,

dict_key.c_str(),