Make BlockedPlugin implement RenderViewObserver so that RenderView doesn't ha...

chrome/renderer/render_view.h

 // Copyright (c) 2011 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 CHROME_RENDERER_RENDER_VIEW_H_
 #define CHROME_RENDERER_RENDER_VIEW_H_
 #pragma once
 
 #include <deque>
 #include <map>
@@ skipping 39 matching lines @@
 
 #if defined(OS_WIN)
 // RenderView is a diamond-shaped hierarchy, with WebWidgetClient at the root.
 // VS warns when we inherit the WebWidgetClient method implementations from
 // RenderWidget.  It's safe to ignore that warning.
 #pragma warning(disable: 4250)
 #endif
 
 class AudioMessageFilter;
 class BlockedPlugin;
-class CustomMenuListener;
 class DictionaryValue;
 class DeviceOrientationDispatcher;
 class DevToolsAgent;
 class DevToolsClient;
 class DomAutomationController;
 class DOMUIBindings;
 class ExternalHostBindings;
 class FilePath;
 class GeolocationDispatcher;
 class GeolocationDispatcherOld;
@@ skipping 274 matching lines @@
   // Create a new plugin without checking the content settings.
   WebKit::WebPlugin* CreatePluginNoCheck(WebKit::WebFrame* frame,
                                          const WebKit::WebPluginParams& params);
 
   // Asks the browser for the CPBrowsingContext associated with this renderer.
   // This is an opaque identifier associated with the renderer for sending
   // messages for the given "Chrome Plugin." The Chrome Plugin API is used
   // only by gears and this function can be deleted when we remove gears.
   uint32 GetCPBrowsingContext();
 
-  // Handles registering and deregistering customer handlers for custom
-  // context menu events.
-  // To install a custom context menu, call showContextMenu() with your
-  // custom entries, followed immediately by CustomMenuListenerInstall() to
-  // register a listener for when a custom menu item is selected. Note that
-  // subsequent calls to showContextMenu() will clear the custom listener.
-  void CustomMenuListenerInstall(CustomMenuListener* listening);
-  void CustomMenuListenerDestroyed(CustomMenuListener* dead);
-
 #if defined(OS_MACOSX)
   // Enables/disabled plugin IME for the given plugin.
   void SetPluginImeEnabled(bool enabled, int plugin_id);
 
   // Helper routines for accelerated plugin support. Used by the
   // WebPluginDelegateProxy, which has a pointer to the RenderView.
   gfx::PluginWindowHandle AllocateFakePluginWindowHandle(bool opaque,
                                                          bool root);
   void DestroyFakePluginWindowHandle(gfx::PluginWindowHandle window);
   void AcceleratedSurfaceSetIOSurface(gfx::PluginWindowHandle window,
                                       int32 width,
                                       int32 height,
                                       uint64 io_surface_identifier);
   TransportDIB::Handle AcceleratedSurfaceAllocTransportDIB(size_t size);
   void AcceleratedSurfaceFreeTransportDIB(TransportDIB::Id dib_id);
   void AcceleratedSurfaceSetTransportDIB(gfx::PluginWindowHandle window,
                                          int32 width,
                                          int32 height,
                                          TransportDIB::Handle transport_dib);
   void AcceleratedSurfaceBuffersSwapped(gfx::PluginWindowHandle window,
                                         uint64 surface_id);
 #endif
 
   void RegisterPluginDelegate(WebPluginDelegateProxy* delegate);
   void UnregisterPluginDelegate(WebPluginDelegateProxy* delegate);
 
-  void RegisterBlockedPlugin(BlockedPlugin* blocked_plugin);
-  void UnregisterBlockedPlugin(BlockedPlugin* blocked_plugin);
-
   // IPC::Channel::Listener implementation -------------------------------------
 
   virtual bool OnMessageReceived(const IPC::Message& msg);
 
   // WebKit::WebWidgetClient implementation ------------------------------------
 
   // Most methods are handled by RenderWidget.
   virtual void didFocus();
   virtual void didBlur();
   virtual void show(WebKit::WebNavigationPolicy policy);
@@ skipping 482 matching lines @@
   void OnGetAllSavableResourceLinksForCurrentPage(const GURL& page_url);
   void OnGetApplicationInfo(int page_id);
   void OnGetSerializedHtmlDataForCurrentPageWithLocalLinks(
       const std::vector<GURL>& links,
       const std::vector<FilePath>& local_paths,
       const FilePath& local_directory_name);
   void OnHandleMessageFromExternalHost(const std::string& message,
                                        const std::string& origin,
                                        const std::string& target);
   void OnInstallMissingPlugin();
-  void OnLoadBlockedPlugins();
   void OnMediaPlayerActionAt(const gfx::Point& location,
                              const WebKit::WebMediaPlayerAction& action);
   void OnMoveOrResizeStarted();
   void OnNavigate(const ViewMsg_Navigate_Params& params);
   void OnNotifyRendererViewType(ViewType::Type view_type);
   void OnPaste();
 #if defined(OS_MACOSX)
   void OnPluginImeCompositionConfirmed(const string16& text, int plugin_id);
 #endif
   void OnPrintingDone(int document_cookie, bool success);
@@ skipping 419 matching lines @@
 
   // All the currently active plugin delegates for this RenderView; kept so that
   // we can enumerate them to send updates about things like window location
   // or tab focus and visibily. These are non-owning references.
   std::set<WebPluginDelegateProxy*> plugin_delegates_;
 
   // A list of all Pepper v1 plugins that we've created that haven't been
   // destroyed yet. Pepper v2 plugins are tracked by the pepper_delegate_.
   std::set<WebPluginDelegatePepper*> current_oldstyle_pepper_plugins_;
 
-  // A list of all BlockedPlugins so they can all be loaded if needed.
-  std::set<BlockedPlugin*> blocked_plugins_;
-
   // Helper objects ------------------------------------------------------------
 
   ScopedRunnableMethodFactory<RenderView> page_info_method_factory_;
   ScopedRunnableMethodFactory<RenderView> accessibility_method_factory_;
 
   // Responsible for translating the page contents to other languages.
   TranslateHelper translate_helper_;
 
   RendererWebCookieJarImpl cookie_jar_;
 
@@ skipping 110 matching lines @@
   // Allows DOM UI pages (new tab page, etc.) to talk to the browser. The JS
   // object is only exposed when DOM UI bindings are enabled.
   scoped_ptr<DOMUIBindings> dom_ui_bindings_;
 
   // External host exposed through automation controller.
   scoped_ptr<ExternalHostBindings> external_host_bindings_;
 
   // The external popup for the currently showing select popup.
   scoped_ptr<ExternalPopupMenu> external_popup_menu_;
 
-  // The custom menu event listener, if any.
-  CustomMenuListener* custom_menu_listener_;
-
   // The node that the context menu was pressed over.
   WebKit::WebNode context_menu_node_;
 
   // Reports load progress to the browser.
   scoped_ptr<LoadProgressTracker> load_progress_tracker_;
 
   // All the registered observers.  We expect this list to be small, so vector
   // is fine.
   ObserverList<RenderViewObserver> observers_;
 
   // ---------------------------------------------------------------------------
   // ADDING NEW DATA? Please see if it fits appropriately in one of the above
   // sections rather than throwing it randomly at the end. If you're adding a
   // bunch of stuff, you should probably create a helper class and put your
   // data and methods on that to avoid bloating RenderView more.  You can use
   // the Observer interface to filter IPC messages and receive frame change
   // notifications.
   // ---------------------------------------------------------------------------
 
   DISALLOW_COPY_AND_ASSIGN(RenderView);
 };
 
 #endif  // CHROME_RENDERER_RENDER_VIEW_H_