Browser Plugin: Simplified BrowserPluginManager

content/renderer/render_view_impl.h

Index: content/renderer/render_view_impl.h
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index f15fa740b578bd7b5eb93fdc0f5854c518828c51..9b7c85134c10aaadb4aabcff6b9f421847f3dd88 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -137,6 +137,7 @@ class WebHitTestResult;
 }
 
 namespace content {
+class BrowserPluginManager;
 class DeviceOrientationDispatcher;
 class DevToolsAgent;
 class DocumentState;
@@ -264,6 +265,9 @@ class CONTENT_EXPORT RenderViewImpl
   }
 #endif
 
+  // Lazily initialize this view's BrowserPluginManager and return it.
+  BrowserPluginManager* browser_plugin_manager();
+
   // Functions to add and remove observers for this object.
   void AddObserver(RenderViewObserver* observer);
   void RemoveObserver(RenderViewObserver* observer);
@@ -1041,6 +1045,8 @@ class CONTENT_EXPORT RenderViewImpl
   // This is used when a frame is going to be removed from the tree.
   void SendUpdatedFrameTree(WebKit::WebFrame* exclude_frame_subtree);
 
+  bool has_browser_plugin_manager() const { return browser_plugin_manager_; }

[Charlie Reis, 2012/11/20 00:33:34]

return !!browser_plugin_manager_;

[Fady Samuel, 2012/11/20 02:04:15]

Deleted.

+
   // Recursively creates a DOM frame tree starting with |frame|, based on
   // |frame_tree|. For each node, the frame is navigated to the swapped out URL,
   // the name (if present) is set on it, and all the subframes are created
@@ -1374,6 +1380,9 @@ class CONTENT_EXPORT RenderViewImpl
   // MediaStream dispatcher attached to this view; lazily initialized.
   MediaStreamDispatcher* media_stream_dispatcher_;
 
+  // BrowserPluginManager attached to this view; lazily initialized.
+  scoped_refptr<BrowserPluginManager> browser_plugin_manager_;
+
   // MediaStreamImpl attached to this view; lazily initialized.
   MediaStreamImpl* media_stream_impl_;