| Index: content/renderer/pepper/ppb_network_monitor_private_impl.h
|
| ===================================================================
|
| --- content/renderer/pepper/ppb_network_monitor_private_impl.h (revision 213482)
|
| +++ content/renderer/pepper/ppb_network_monitor_private_impl.h (working copy)
|
| @@ -2,16 +2,16 @@
|
| // 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_
|
| +#ifndef CONTENT_RENDERER_PEPPER_PPB_NETWORK_MONITOR_PRIVATE_IMPL_H_
|
| +#define CONTENT_RENDERER_PEPPER_PPB_NETWORK_MONITOR_PRIVATE_IMPL_H_
|
|
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| +#include "content/renderer/pepper/plugin_delegate.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 {
|
| @@ -25,8 +25,6 @@
|
| PPB_NetworkMonitor_Callback callback,
|
| void* user_data);
|
|
|
| - virtual ~PPB_NetworkMonitor_Private_Impl();
|
| -
|
| virtual ::ppapi::thunk::PPB_NetworkMonitor_Private_API*
|
| AsPPB_NetworkMonitor_Private_API() OVERRIDE;
|
|
|
| @@ -38,6 +36,7 @@
|
| PPB_NetworkMonitor_Private_Impl(PP_Instance instance,
|
| PPB_NetworkMonitor_Callback callback,
|
| void* user_data);
|
| + virtual ~PPB_NetworkMonitor_Private_Impl();
|
|
|
| bool Start();
|
|
|
| @@ -51,4 +50,4 @@
|
| } // namespace ppapi
|
| } // namespace webkit
|
|
|
| -#endif // WEBKIT_PLUGINS_PPAPI_PPB_NETWORK_MONITOR_PRIVATE_IMPL_H_
|
| +#endif // CONTENT_RENDERER_PEPPER_PPB_NETWORK_MONITOR_PRIVATE_IMPL_H_
|
|
|