diff options
author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 17:56:49 +0000 |
---|---|---|
committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 17:56:49 +0000 |
commit | 5bc5c15301e555c7d22b27d2b30c56b6ca1770ac (patch) | |
tree | 3224de17fcacd84b3e723922b9911d1f73a33c50 /webkit | |
parent | e50540ec88e9a2102a028336335fc8eb4ee026ee (diff) | |
download | chromium_src-5bc5c15301e555c7d22b27d2b30c56b6ca1770ac.zip chromium_src-5bc5c15301e555c7d22b27d2b30c56b6ca1770ac.tar.gz chromium_src-5bc5c15301e555c7d22b27d2b30c56b6ca1770ac.tar.bz2 |
Remove RemoteAccessClientFirewallTraversal policy and code paths.
BUG=96318
TEST=
Review URL: http://codereview.chromium.org/8275012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106521 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/plugins/ppapi/mock_plugin_delegate.cc | 6 | ||||
-rw-r--r-- | webkit/plugins/ppapi/mock_plugin_delegate.h | 2 | ||||
-rw-r--r-- | webkit/plugins/ppapi/plugin_delegate.h | 10 | ||||
-rw-r--r-- | webkit/plugins/ppapi/plugin_module.cc | 1 | ||||
-rw-r--r-- | webkit/plugins/ppapi/ppapi_plugin_instance.cc | 25 | ||||
-rw-r--r-- | webkit/plugins/ppapi/ppapi_plugin_instance.h | 5 |
6 files changed, 0 insertions, 49 deletions
diff --git a/webkit/plugins/ppapi/mock_plugin_delegate.cc b/webkit/plugins/ppapi/mock_plugin_delegate.cc index 060284c..2ee70c3 100644 --- a/webkit/plugins/ppapi/mock_plugin_delegate.cc +++ b/webkit/plugins/ppapi/mock_plugin_delegate.cc @@ -204,9 +204,6 @@ void MockPluginDelegate::SyncGetFileSystemPlatformPath( *platform_path = FilePath(); } -void MockPluginDelegate::PublishPolicy(const std::string& policy_json) { -} - scoped_refptr<base::MessageLoopProxy> MockPluginDelegate::GetFileThreadMessageLoopProxy() { return scoped_refptr<base::MessageLoopProxy>(); @@ -249,9 +246,6 @@ void MockPluginDelegate::ZoomLimitsChanged(double minimum_factor, double maximum_factor) { } -void MockPluginDelegate::SubscribeToPolicyUpdates(PluginInstance* instance) { -} - std::string MockPluginDelegate::ResolveProxy(const GURL& url) { return std::string(); } diff --git a/webkit/plugins/ppapi/mock_plugin_delegate.h b/webkit/plugins/ppapi/mock_plugin_delegate.h index 523973b..c691cdb 100644 --- a/webkit/plugins/ppapi/mock_plugin_delegate.h +++ b/webkit/plugins/ppapi/mock_plugin_delegate.h @@ -88,7 +88,6 @@ class MockPluginDelegate : public PluginDelegate { DirContents* contents); virtual void SyncGetFileSystemPlatformPath(const GURL& url, FilePath* platform_path); - virtual void PublishPolicy(const std::string& policy_json); virtual scoped_refptr<base::MessageLoopProxy> GetFileThreadMessageLoopProxy(); virtual int32_t ConnectTcp( @@ -108,7 +107,6 @@ class MockPluginDelegate : public PluginDelegate { virtual std::string GetDefaultEncoding(); virtual void ZoomLimitsChanged(double minimum_factor, double maximum_factor); - virtual void SubscribeToPolicyUpdates(PluginInstance* instance); virtual std::string ResolveProxy(const GURL& url); virtual void DidStartLoading(); virtual void DidStopLoading(); diff --git a/webkit/plugins/ppapi/plugin_delegate.h b/webkit/plugins/ppapi/plugin_delegate.h index e9c0258..2a92985 100644 --- a/webkit/plugins/ppapi/plugin_delegate.h +++ b/webkit/plugins/ppapi/plugin_delegate.h @@ -348,12 +348,6 @@ class PluginDelegate { const GURL& directory_path, fileapi::FileSystemCallbackDispatcher* dispatcher) = 0; - // Takes a UTF-8 string representing the enterprise policy, and pushes it to - // every plugin instance that has called SubscribeToPolicyUpdates(). - // - // This should be called when the enterprise policy is updated. - virtual void PublishPolicy(const std::string& policy_json) = 0; - // For quota handlings for FileIO API. typedef base::Callback<void (int64)> AvailableSpaceCallback; virtual void QueryAvailableSpace(const GURL& origin, @@ -415,10 +409,6 @@ class PluginDelegate { virtual void ZoomLimitsChanged(double minimum_factor, double maximum_factor) = 0; - // Subscribes the instances to notifications that the policy has been - // updated. - virtual void SubscribeToPolicyUpdates(PluginInstance* instance) = 0; - // Retrieves the proxy information for the given URL in PAC format. On error, // this will return an empty string. virtual std::string ResolveProxy(const GURL& url) = 0; diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc index f4db023..cc4350a 100644 --- a/webkit/plugins/ppapi/plugin_module.cc +++ b/webkit/plugins/ppapi/plugin_module.cc @@ -28,7 +28,6 @@ #include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h" #include "ppapi/c/dev/ppb_layer_compositor_dev.h" #include "ppapi/c/dev/ppb_memory_dev.h" -#include "ppapi/c/dev/ppb_query_policy_dev.h" #include "ppapi/c/dev/ppb_scrollbar_dev.h" #include "ppapi/c/dev/ppb_surface_3d_dev.h" #include "ppapi/c/dev/ppb_testing_dev.h" diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc index 5ec687d..cee2c8d 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc @@ -18,7 +18,6 @@ #include "ppapi/c/dev/ppb_memory_dev.h" #include "ppapi/c/dev/ppb_zoom_dev.h" #include "ppapi/c/dev/ppp_find_dev.h" -#include "ppapi/c/dev/ppp_policy_update_dev.h" #include "ppapi/c/dev/ppp_selection_dev.h" #include "ppapi/c/dev/ppp_zoom_dev.h" #include "ppapi/c/pp_input_event.h" @@ -285,7 +284,6 @@ PluginInstance::PluginInstance( plugin_input_event_interface_(NULL), plugin_private_interface_(NULL), plugin_pdf_interface_(NULL), - plugin_policy_updated_interface_(NULL), plugin_selection_interface_(NULL), plugin_zoom_interface_(NULL), checked_for_plugin_input_event_interface_(false), @@ -703,14 +701,6 @@ bool PluginInstance::HandleInputEvent(const WebKit::WebInputEvent& event, return rv; } -void PluginInstance::HandlePolicyUpdate(const std::string& policy_json) { - if (!LoadPolicyUpdateInterface()) - return; - plugin_policy_updated_interface_->PolicyUpdated( - pp_instance(), - StringVar::StringToPPVar(module()->pp_module(), policy_json)); -} - void PluginInstance::HandleMessage(PP_Var message) { TRACE_EVENT0("ppapi", "PluginInstance::HandleMessage"); // Keep a reference on the stack. See NOTE above. @@ -983,16 +973,6 @@ bool PluginInstance::LoadPdfInterface() { return !!plugin_pdf_interface_; } -bool PluginInstance::LoadPolicyUpdateInterface() { - if (!plugin_policy_updated_interface_) { - plugin_policy_updated_interface_ = - static_cast<const PPP_PolicyUpdate_Dev*>(module_->GetPluginInterface( - PPP_POLICYUPDATE_DEV_INTERFACE)); - } - - return !!plugin_policy_updated_interface_; -} - bool PluginInstance::LoadPrintInterface() { if (!plugin_print_interface_) { plugin_print_interface_ = static_cast<const PPP_Printing_Dev*>( @@ -1016,7 +996,6 @@ bool PluginInstance::LoadSelectionInterface() { static_cast<const PPP_Selection_Dev*>(module_->GetPluginInterface( PPP_SELECTION_DEV_INTERFACE)); } - return !!plugin_selection_interface_; } @@ -1931,10 +1910,6 @@ void PluginInstance::UnlockMouse(PP_Instance instance) { delegate()->UnlockMouse(this); } -void PluginInstance::SubscribeToPolicyUpdates(PP_Instance instance) { - delegate()->SubscribeToPolicyUpdates(this); -} - PP_Var PluginInstance::ResolveRelativeToDocument( PP_Instance instance, PP_Var relative, diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.h b/webkit/plugins/ppapi/ppapi_plugin_instance.h index 73a334d..5ec97a3 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.h +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h @@ -44,7 +44,6 @@ struct PPP_Instance_Private; struct PPP_Messaging; struct PPP_MouseLock; struct PPP_Pdf; -struct PPP_PolicyUpdate_Dev; struct PPP_Selection_Dev; struct PPP_Zoom_Dev; @@ -163,7 +162,6 @@ class PluginInstance : public base::RefCounted<PluginInstance>, bool HandleDocumentLoad(PPB_URLLoader_Impl* loader); bool HandleInputEvent(const WebKit::WebInputEvent& event, WebKit::WebCursorInfo* cursor_info); - void HandlePolicyUpdate(const std::string& policy_json); PP_Var GetInstanceObject(); void ViewChanged(const gfx::Rect& position, const gfx::Rect& clip); @@ -349,7 +347,6 @@ class PluginInstance : public base::RefCounted<PluginInstance>, virtual int32_t LockMouse(PP_Instance instance, PP_CompletionCallback callback) OVERRIDE; virtual void UnlockMouse(PP_Instance instance) OVERRIDE; - virtual void SubscribeToPolicyUpdates(PP_Instance instance) OVERRIDE; virtual PP_Var ResolveRelativeToDocument( PP_Instance instance, PP_Var relative, @@ -377,7 +374,6 @@ class PluginInstance : public base::RefCounted<PluginInstance>, bool LoadMessagingInterface(); bool LoadMouseLockInterface(); bool LoadPdfInterface(); - bool LoadPolicyUpdateInterface(); bool LoadPrintInterface(); bool LoadPrivateInterface(); bool LoadSelectionInterface(); @@ -512,7 +508,6 @@ class PluginInstance : public base::RefCounted<PluginInstance>, const PPP_InputEvent* plugin_input_event_interface_; const PPP_Instance_Private* plugin_private_interface_; const PPP_Pdf* plugin_pdf_interface_; - const PPP_PolicyUpdate_Dev* plugin_policy_updated_interface_; const PPP_Selection_Dev* plugin_selection_interface_; const PPP_Zoom_Dev* plugin_zoom_interface_; |