chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc - Issue 275543005: Use GUID instead of ServicePath in networkingPrivate API

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 275543005: Use GUID instead of ServicePath in networkingPrivate API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 6 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/extensions/api/networking_private/networking_private_service_client.cc ('k') | chrome/common/extensions/api/networking_private.json » ('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 8d18de4075f6a6fff5cb3c3ddcfacb9404d8bb49..03740a98c7de42d92c7855a5684832baa847776b 100644

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

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

@@ -303,8 +303,10 @@ bool HasPolicyForFavorite(const FavoriteState* favorite,

bool HasPolicyForNetwork(const NetworkState* network,

const PrefService* profile_prefs) {

const FavoriteState* favorite =

- NetworkHandler::Get()->network_state_handler()->GetFavoriteState(

- network->path());

+ NetworkHandler::Get()

+ ->network_state_handler()

+ ->GetFavoriteStateFromServicePath(network->path(),

+ true /* configured_only */);

if (!favorite)

return false;

return HasPolicyForFavorite(favorite, profile_prefs);