chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc - Issue 320063002: NetworkingPrivate API events should supply list of GUIDs, not service paths

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/extensions/api/networking_private/networking_private_event_router_chromeos.cc

Issue 320063002: NetworkingPrivate API events should supply list of GUIDs, not service paths (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 6 years, 6 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_apitest.cc ('k') | chrome/test/data/extensions/api_test/networking/test.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc

diff --git a/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc b/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc

index 73f3a635fa136c657120ee30aeed920f58ccc504..786690a89272d80d70e5ad8ef4fca8b22414fe59 100644

--- a/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc

+++ b/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc

@@ -159,10 +159,7 @@ void NetworkingPrivateEventRouterImpl::NetworkListChanged() {

networks.begin();

iter != networks.end();

++iter) {

- // TODO(gspencer): Currently the "GUID" is actually the service path. Fix

- // this to be the real GUID once we're using

- // ManagedNetworkConfigurationManager.

- changes.push_back((*iter)->path());

+ changes.push_back((*iter)->guid());

}

scoped_ptr<base::ListValue> args(

@@ -185,7 +182,7 @@ void NetworkingPrivateEventRouterImpl::NetworkPropertiesUpdated(

network->path());

scoped_ptr<base::ListValue> args(

api::networking_private::OnNetworksChanged::Create(

- std::vector<std::string>(1, network->path())));

+ std::vector<std::string>(1, network->guid())));

scoped_ptr<Event> extension_event(new Event(

api::networking_private::OnNetworksChanged::kEventName, args.Pass()));

event_router->BroadcastEvent(extension_event.Pass());

@@ -194,7 +191,7 @@ void NetworkingPrivateEventRouterImpl::NetworkPropertiesUpdated(

void NetworkingPrivateEventRouterImpl::OnPortalDetectionCompleted(

const NetworkState* network,

const NetworkPortalDetector::CaptivePortalState& state) {

- const std::string path = network ? network->path() : std::string();

+ const std::string path = network ? network->guid() : std::string();

EventRouter* event_router = EventRouter::Get(profile_);

if (!event_router->HasEventListener(