Index: ppapi/cpp/network_monitor.cc |
diff --git a/ppapi/cpp/private/network_monitor_private.cc b/ppapi/cpp/network_monitor.cc |
similarity index 35% |
rename from ppapi/cpp/private/network_monitor_private.cc |
rename to ppapi/cpp/network_monitor.cc |
index 7cef97ff0e6468277cb8ec593737090710b2a732..b721e965dca23a170058d1f6c1002aa7cbb3d988 100644 |
--- a/ppapi/cpp/private/network_monitor_private.cc |
+++ b/ppapi/cpp/network_monitor.cc |
@@ -2,43 +2,43 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "ppapi/cpp/private/network_monitor_private.h" |
+#include "ppapi/cpp/network_monitor.h" |
-#include "ppapi/c/private/ppb_network_monitor_private.h" |
+#include "ppapi/c/ppb_network_monitor.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" |
+#include "ppapi/cpp/network_list.h" |
namespace pp { |
namespace { |
-template <> const char* interface_name<PPB_NetworkMonitor_Private_0_3>() { |
- return PPB_NETWORKMONITOR_PRIVATE_INTERFACE_0_3; |
+template <> const char* interface_name<PPB_NetworkMonitor_1_0>() { |
+ return PPB_NETWORKMONITOR_INTERFACE_1_0; |
} |
} // namespace |
-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())); |
+NetworkMonitor::NetworkMonitor(const InstanceHandle& instance) { |
+ if (has_interface<PPB_NetworkMonitor_1_0>()) { |
+ PassRefFromConstructor(get_interface<PPB_NetworkMonitor_1_0>()->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( |
+int32_t NetworkMonitor::UpdateNetworkList( |
+ const CompletionCallbackWithOutput<NetworkList>& callback) { |
+ if (has_interface<PPB_NetworkMonitor_1_0>()) { |
+ return get_interface<PPB_NetworkMonitor_1_0>()->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_0_3>(); |
+bool NetworkMonitor::IsAvailable() { |
+ return has_interface<PPB_NetworkMonitor_1_0>(); |
} |
} // namespace pp |