chrome/browser/ui/webui/options/chromeos/internet_options_handler.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/ui/webui/options/chromeos/internet_options_handler.cc

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

Patch Set: Renamed ConfigStateToString. 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

« chrome/browser/net/pref_proxy_config_tracker_impl.cc ('K') | « chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

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

index 1cf06bede6daa5af0d5e2de4eaa6bdcac4c87f5e..0ef40c491a904b248eb8500a2fd03c0860bd8c09 100644

--- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

@@ -37,6 +37,7 @@

#include "chrome/browser/chromeos/settings/cros_settings.h"

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

#include "chrome/browser/chromeos/status/network_menu_icon.h"

+#include "chrome/browser/chromeos/ui_proxy_config_service.h"

#include "chrome/browser/net/pref_proxy_config_tracker.h"

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

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

@@ -1264,8 +1265,8 @@ void InternetOptionsHandler::PopulateIPConfigsCallback(

if (!network)

return;

- Profile::FromWebUI(web_ui())->GetProxyConfigTracker()->UISetCurrentNetwork(

- service_path);

+ Profile::FromWebUI(web_ui())->

+ GetProxyConfigTracker()->GetUIService().SetCurrentNetwork(service_path);

const chromeos::NetworkUIData& ui_data = network->ui_data();

const chromeos::NetworkPropertyUIData property_ui_data(ui_data.onc_source());