Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2058)

Unified Diff: ppapi/cpp/private/network_monitor_private.cc

Issue 23453025: Refactor PPB_NetworkMonitor_Private interface to use CompletionCallback. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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
Index: ppapi/cpp/private/network_monitor_private.cc
diff --git a/ppapi/cpp/private/network_monitor_private.cc b/ppapi/cpp/private/network_monitor_private.cc
index 2f931ea4288503c71567b0f2affef80d01abb576..7cef97ff0e6468277cb8ec593737090710b2a732 100644
--- a/ppapi/cpp/private/network_monitor_private.cc
+++ b/ppapi/cpp/private/network_monitor_private.cc
@@ -4,32 +4,41 @@
#include "ppapi/cpp/private/network_monitor_private.h"
+#include "ppapi/c/private/ppb_network_monitor_private.h"
+#include "ppapi/cpp/completion_callback.h"
#include "ppapi/cpp/instance.h"
#include "ppapi/cpp/module_impl.h"
+#include "ppapi/cpp/private/network_list_private.h"
namespace pp {
namespace {
-template <> const char* interface_name<PPB_NetworkMonitor_Private>() {
- return PPB_NETWORKMONITOR_PRIVATE_INTERFACE;
+template <> const char* interface_name<PPB_NetworkMonitor_Private_0_3>() {
+ return PPB_NETWORKMONITOR_PRIVATE_INTERFACE_0_3;
}
} // namespace
-NetworkMonitorPrivate::NetworkMonitorPrivate(
- const InstanceHandle& instance,
- PPB_NetworkMonitor_Callback callback,
- void* user_data) {
- if (has_interface<PPB_NetworkMonitor_Private>()) {
- PassRefFromConstructor(get_interface<PPB_NetworkMonitor_Private>()->Create(
- instance.pp_instance(), callback, user_data));
+NetworkMonitorPrivate::NetworkMonitorPrivate(const InstanceHandle& instance) {
+ if (has_interface<PPB_NetworkMonitor_Private_0_3>()) {
+ PassRefFromConstructor(get_interface<PPB_NetworkMonitor_Private_0_3>()->
+ Create(instance.pp_instance()));
}
}
+int32_t NetworkMonitorPrivate::UpdateNetworkList(
+ const CompletionCallbackWithOutput<NetworkListPrivate>& callback) {
+ if (has_interface<PPB_NetworkMonitor_Private_0_3>()) {
+ return get_interface<PPB_NetworkMonitor_Private_0_3>()->UpdateNetworkList(
+ pp_resource(), callback.output(), callback.pp_completion_callback());
+ }
+ return callback.MayForce(PP_ERROR_NOINTERFACE);
+}
+
// static
bool NetworkMonitorPrivate::IsAvailable() {
- return has_interface<PPB_NetworkMonitor_Private>();
+ return has_interface<PPB_NetworkMonitor_Private_0_3>();
}
} // namespace pp
« no previous file with comments | « ppapi/cpp/private/network_monitor_private.h ('k') | ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698