extensions/browser/api/networking_private/networking_private_delegate.h - Issue 1779633002: Invoke createNetwork() callback with GUID, not service name

Unified Diff: extensions/browser/api/networking_private/networking_private_delegate.h

Issue 1779633002: Invoke createNetwork() callback with GUID, not service name (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: pass both service_path and guid arguments to all callbacks Created 4 years, 9 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

« extensions/browser/api/networking_private/networking_private_chromeos.cc ('K') | « extensions/browser/api/networking_private/networking_private_chromeos.cc ('k') | extensions/browser/api/networking_private/networking_private_linux.h » ('j') | extensions/browser/api/networking_private/networking_private_service_client.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/api/networking_private/networking_private_delegate.h

diff --git a/extensions/browser/api/networking_private/networking_private_delegate.h b/extensions/browser/api/networking_private/networking_private_delegate.h

index 410d4858d842865f547dcbb6751f9dbef13fe242..89b7cb8ec8fb141aa1166150ff7a89fa648c642b 100644

--- a/extensions/browser/api/networking_private/networking_private_delegate.h

+++ b/extensions/browser/api/networking_private/networking_private_delegate.h

@@ -37,6 +37,8 @@ class NetworkingPrivateDelegate : public KeyedService {

using VoidCallback = base::Callback<void()>;

using BoolCallback = base::Callback<void(bool)>;

using StringCallback = base::Callback<void(const std::string&)>;

+ using ServiceCallback =

+ base::Callback<void(const std::string&, const std::string&)>;

stevenjb 2016/03/10 01:49:10 'ServiceCallback' isn't very meaningful in this co

Kevin Cernekee 2016/03/11 01:53:57 Done.

using NetworkListCallback = base::Callback<void(scoped_ptr<base::ListValue>)>;

using FailureCallback = base::Callback<void(const std::string&)>;

using DeviceStateList =

@@ -53,6 +55,7 @@ class NetworkingPrivateDelegate : public KeyedService {

VerificationProperties;

typedef NetworkingPrivateDelegate::BoolCallback BoolCallback;

typedef NetworkingPrivateDelegate::StringCallback StringCallback;

+ typedef NetworkingPrivateDelegate::ServiceCallback ServiceCallback;

typedef NetworkingPrivateDelegate::FailureCallback FailureCallback;

VerifyDelegate();

@@ -125,7 +128,7 @@ class NetworkingPrivateDelegate : public KeyedService {

const FailureCallback& failure_callback) = 0;

virtual void CreateNetwork(bool shared,

scoped_ptr<base::DictionaryValue> properties,

- const StringCallback& success_callback,

+ const ServiceCallback& success_callback,

const FailureCallback& failure_callback) = 0;

virtual void ForgetNetwork(const std::string& guid,

const VoidCallback& success_callback,