summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/network_list_observer.h33
-rw-r--r--webkit/glue/webkit_glue.gypi3
-rw-r--r--webkit/plugins/ppapi/mock_plugin_delegate.cc9
-rw-r--r--webkit/plugins/ppapi/mock_plugin_delegate.h7
-rw-r--r--webkit/plugins/ppapi/plugin_delegate.h7
-rw-r--r--webkit/plugins/ppapi/ppb_network_monitor_private_impl.cc87
-rw-r--r--webkit/plugins/ppapi/ppb_network_monitor_private_impl.h57
-rw-r--r--webkit/plugins/ppapi/resource_creation_impl.cc4
8 files changed, 2 insertions, 205 deletions
diff --git a/webkit/glue/network_list_observer.h b/webkit/glue/network_list_observer.h
deleted file mode 100644
index 288bfa7..0000000
--- a/webkit/glue/network_list_observer.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef WEBKIT_GLUE_NETWORK_LIST_OBSERVER_H_
-#define WEBKIT_GLUE_NETWORK_LIST_OBSERVER_H_
-
-#include <vector>
-
-namespace net {
-struct NetworkInterface;
-typedef std::vector<NetworkInterface> NetworkInterfaceList;
-} // namespace net
-
-namespace webkit_glue {
-
-class NetworkListObserver {
- public:
- virtual ~NetworkListObserver() {}
-
- virtual void OnNetworkListChanged(
- const net::NetworkInterfaceList& list) = 0;
-
- protected:
- NetworkListObserver() {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(NetworkListObserver);
-};
-
-} // namespace webkit_glue
-
-#endif // WEBKIT_GLUE_NETWORK_LIST_OBSERVER_H_
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 22dbf55..829e799 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -296,8 +296,6 @@
'../plugins/ppapi/ppb_image_data_impl.h',
'../plugins/ppapi/ppb_layer_compositor_impl.cc',
'../plugins/ppapi/ppb_layer_compositor_impl.h',
- '../plugins/ppapi/ppb_network_monitor_private_impl.cc',
- '../plugins/ppapi/ppb_network_monitor_private_impl.h',
'../plugins/ppapi/ppb_proxy_impl.cc',
'../plugins/ppapi/ppb_proxy_impl.h',
'../plugins/ppapi/ppb_scrollbar_impl.cc',
@@ -374,7 +372,6 @@
'image_resource_fetcher.h',
'multipart_response_delegate.cc',
'multipart_response_delegate.h',
- 'network_list_observer.h',
'npruntime_util.cc',
'npruntime_util.h',
'p2p_transport.cc',
diff --git a/webkit/plugins/ppapi/mock_plugin_delegate.cc b/webkit/plugins/ppapi/mock_plugin_delegate.cc
index 81a0690..91824d7 100644
--- a/webkit/plugins/ppapi/mock_plugin_delegate.cc
+++ b/webkit/plugins/ppapi/mock_plugin_delegate.cc
@@ -314,15 +314,6 @@ void MockPluginDelegate::TCPServerSocketStopListening(uint32 real_socket_id,
uint32 temp_socket_id) {
}
-bool MockPluginDelegate::AddNetworkListObserver(
- webkit_glue::NetworkListObserver* observer) {
- return false;
-}
-
-void MockPluginDelegate::RemoveNetworkListObserver(
- webkit_glue::NetworkListObserver* observer) {
-}
-
int32_t MockPluginDelegate::ShowContextMenu(
PluginInstance* instance,
webkit::ppapi::PPB_Flash_Menu_Impl* menu,
diff --git a/webkit/plugins/ppapi/mock_plugin_delegate.h b/webkit/plugins/ppapi/mock_plugin_delegate.h
index 95fbafe..8327850 100644
--- a/webkit/plugins/ppapi/mock_plugin_delegate.h
+++ b/webkit/plugins/ppapi/mock_plugin_delegate.h
@@ -142,13 +142,6 @@ class MockPluginDelegate : public PluginDelegate {
virtual void TCPServerSocketAccept(uint32 real_socket_id);
virtual void TCPServerSocketStopListening(uint32 real_socket_id,
uint32 temp_socket_id);
-
- // Add/remove a network list observer.
- virtual bool AddNetworkListObserver(
- webkit_glue::NetworkListObserver* observer) OVERRIDE;
- virtual void RemoveNetworkListObserver(
- webkit_glue::NetworkListObserver* observer) OVERRIDE;
-
virtual int32_t ShowContextMenu(
PluginInstance* instance,
webkit::ppapi::PPB_Flash_Menu_Impl* menu,
diff --git a/webkit/plugins/ppapi/plugin_delegate.h b/webkit/plugins/ppapi/plugin_delegate.h
index 9de72bc..5585072 100644
--- a/webkit/plugins/ppapi/plugin_delegate.h
+++ b/webkit/plugins/ppapi/plugin_delegate.h
@@ -71,7 +71,6 @@ struct WebFileChooserParams;
namespace webkit_glue {
class ClipboardClient;
class P2PTransport;
-class NetworkListObserver;
} // namespace webkit_glue
namespace webkit {
@@ -483,12 +482,6 @@ class PluginDelegate {
virtual void TCPServerSocketStopListening(uint32 real_socket_id,
uint32 temp_socket_id) = 0;
- // Add/remove a network list observer.
- virtual bool AddNetworkListObserver(
- webkit_glue::NetworkListObserver* observer) = 0;
- virtual void RemoveNetworkListObserver(
- webkit_glue::NetworkListObserver* observer) = 0;
-
// Show the given context menu at the given position (in the plugin's
// coordinates).
virtual int32_t ShowContextMenu(
diff --git a/webkit/plugins/ppapi/ppb_network_monitor_private_impl.cc b/webkit/plugins/ppapi/ppb_network_monitor_private_impl.cc
deleted file mode 100644
index 1dc2614..0000000
--- a/webkit/plugins/ppapi/ppb_network_monitor_private_impl.cc
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "webkit/plugins/ppapi/ppb_network_monitor_private_impl.h"
-
-#include "base/bind.h"
-#include "ppapi/shared_impl/ppb_network_list_private_shared.h"
-#include "net/base/net_util.h"
-#include "webkit/plugins/ppapi/resource_helper.h"
-
-namespace webkit {
-namespace ppapi {
-
-PPB_NetworkMonitor_Private_Impl::PPB_NetworkMonitor_Private_Impl(
- PP_Instance instance,
- PPB_NetworkMonitor_Callback callback,
- void* user_data)
- : Resource(::ppapi::OBJECT_IS_IMPL, instance),
- callback_(callback),
- user_data_(user_data),
- started_(false) {
-}
-
-PPB_NetworkMonitor_Private_Impl::~PPB_NetworkMonitor_Private_Impl() {
- PluginDelegate* plugin_delegate = ResourceHelper::GetPluginDelegate(this);
- if (plugin_delegate && started_) {
- plugin_delegate->RemoveNetworkListObserver(this);
- }
-}
-
-// static
-PP_Resource PPB_NetworkMonitor_Private_Impl::Create(
- PP_Instance instance,
- PPB_NetworkMonitor_Callback callback,
- void* user_data) {
- scoped_refptr<PPB_NetworkMonitor_Private_Impl> result(
- new PPB_NetworkMonitor_Private_Impl(instance, callback, user_data));
- if (!result->Start())
- return 0;
- return result->GetReference();
-}
-
-::ppapi::thunk::PPB_NetworkMonitor_Private_API*
-PPB_NetworkMonitor_Private_Impl::AsPPB_NetworkMonitor_Private_API() {
- return this;
-}
-
-bool PPB_NetworkMonitor_Private_Impl::Start() {
- PluginDelegate* plugin_delegate = ResourceHelper::GetPluginDelegate(this);
- if (!plugin_delegate)
- return false;
- started_ = plugin_delegate->AddNetworkListObserver(this);
- return started_;
-}
-
-void PPB_NetworkMonitor_Private_Impl::OnNetworkListChanged(
- const net::NetworkInterfaceList& list) {
- scoped_ptr< ::ppapi::PPB_NetworkList_Private_Shared::NetworkList> list_copy(
- new ::ppapi::PPB_NetworkList_Private_Shared::NetworkList(list.size()));
- for (size_t i = 0; i < list.size(); ++i) {
- ::ppapi::PPB_NetworkList_Private_Shared::NetworkInfo& network =
- list_copy->at(i);
- network.name = list[i].name;
-
- network.addresses.resize(1);
- CHECK_LE(list[i].address.size(), sizeof(network.addresses[0].data));
- network.addresses[0].size = list[i].address.size();
- memcpy(network.addresses[0].data, &(list[i].address.front()),
- list[i].address.size());
-
- // TODO(sergeyu): Currently net::NetworkInterfaceList provides
- // only name and one IP address. Add all other fields and copy
- // them here.
- network.type = PP_NETWORKLIST_UNKNOWN;
- network.state = PP_NETWORKLIST_UP;
- network.display_name = list[i].name;
- network.mtu = 0;
- }
- PP_Resource list_resource =
- ::ppapi::PPB_NetworkList_Private_Shared::Create(
- ::ppapi::OBJECT_IS_IMPL, pp_instance(), list_copy.Pass());
- callback_(user_data_, list_resource);
-}
-
-} // namespace ppapi
-} // namespace webkit
diff --git a/webkit/plugins/ppapi/ppb_network_monitor_private_impl.h b/webkit/plugins/ppapi/ppb_network_monitor_private_impl.h
deleted file mode 100644
index a658737..0000000
--- a/webkit/plugins/ppapi/ppb_network_monitor_private_impl.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef WEBKIT_PLUGINS_PPAPI_PPB_NETWORK_MONITOR_PRIVATE_IMPL_H_
-#define WEBKIT_PLUGINS_PPAPI_PPB_NETWORK_MONITOR_PRIVATE_IMPL_H_
-
-#include <list>
-#include <string>
-
-#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
-#include "ppapi/c/private/ppb_network_monitor_private.h"
-#include "ppapi/shared_impl/resource.h"
-#include "ppapi/thunk/ppb_network_monitor_private_api.h"
-#include "webkit/glue/network_list_observer.h"
-#include "webkit/plugins/ppapi/plugin_delegate.h"
-
-namespace webkit {
-namespace ppapi {
-
-class PPB_NetworkMonitor_Private_Impl
- : public ::ppapi::Resource,
- public ::ppapi::thunk::PPB_NetworkMonitor_Private_API,
- public webkit_glue::NetworkListObserver {
- public:
- static PP_Resource Create(PP_Instance instance,
- PPB_NetworkMonitor_Callback callback,
- void* user_data);
-
- virtual ~PPB_NetworkMonitor_Private_Impl();
-
- virtual ::ppapi::thunk::PPB_NetworkMonitor_Private_API*
- AsPPB_NetworkMonitor_Private_API() OVERRIDE;
-
- // NetworkListObserver interface.
- virtual void OnNetworkListChanged(
- const net::NetworkInterfaceList& list) OVERRIDE;
-
- private:
- PPB_NetworkMonitor_Private_Impl(PP_Instance instance,
- PPB_NetworkMonitor_Callback callback,
- void* user_data);
-
- bool Start();
-
- PPB_NetworkMonitor_Callback callback_;
- void* user_data_;
- bool started_;
-
- DISALLOW_COPY_AND_ASSIGN(PPB_NetworkMonitor_Private_Impl);
-};
-
-} // namespace ppapi
-} // namespace webkit
-
-#endif // WEBKIT_PLUGINS_PPAPI_PPB_NETWORK_MONITOR_PRIVATE_IMPL_H_
diff --git a/webkit/plugins/ppapi/resource_creation_impl.cc b/webkit/plugins/ppapi/resource_creation_impl.cc
index 1afc5bf..66ef911 100644
--- a/webkit/plugins/ppapi/resource_creation_impl.cc
+++ b/webkit/plugins/ppapi/resource_creation_impl.cc
@@ -26,7 +26,6 @@
#include "webkit/plugins/ppapi/ppb_graphics_2d_impl.h"
#include "webkit/plugins/ppapi/ppb_graphics_3d_impl.h"
#include "webkit/plugins/ppapi/ppb_image_data_impl.h"
-#include "webkit/plugins/ppapi/ppb_network_monitor_private_impl.h"
#include "webkit/plugins/ppapi/ppb_scrollbar_impl.h"
#include "webkit/plugins/ppapi/ppb_tcp_server_socket_private_impl.h"
#include "webkit/plugins/ppapi/ppb_tcp_socket_private_impl.h"
@@ -248,7 +247,8 @@ PP_Resource ResourceCreationImpl::CreateNetworkMonitor(
PP_Instance instance,
PPB_NetworkMonitor_Callback callback,
void* user_data) {
- return PPB_NetworkMonitor_Private_Impl::Create(instance, callback, user_data);
+ NOTIMPLEMENTED();
+ return 0;
}
PP_Resource ResourceCreationImpl::CreateScrollbar(PP_Instance instance,
generated by cgit v1.1 at 2025-02-11 14:06:17 +0000