Browser Plugin: Simplified BrowserPluginManager

content/renderer/browser_plugin/browser_plugin.h

 // 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  CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_H_
 #define  CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_H_
 
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h"
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 185 matching lines @@
       RenderViewImpl* render_view,
       WebKit::WebFrame* frame,
       const WebKit::WebPluginParams& params);
 
   virtual ~BrowserPlugin();
 
   int width() const { return plugin_rect_.width(); }
   int height() const { return plugin_rect_.height(); }
   int instance_id() const { return instance_id_; }
   int render_view_routing_id() const { return render_view_routing_id_; }
+  BrowserPluginManager* browser_plugin_manager() const {
+    return browser_plugin_manager_;
+  }
 
   // Virtual to allow for mocking in tests.
   virtual float GetDeviceScaleFactor() const;
 
   // Parses the attributes of the browser plugin from the element's attributes
   // and sets them appropriately.
   void ParseAttributes(const WebKit::WebPluginParams& params);
 
   // Returns the pending resize guest param if there is one. Returns a param
   // with invalid transport dib otherwise.
@@ skipping 67 matching lines @@
   bool embedder_focused_;
   // Tracks the visibility of the browser plugin regardless of the whole
   // embedder RenderView's visibility.
   bool visible_;
 
   WebCursor cursor_;
 
   gfx::Size last_view_size_;
   bool size_changed_in_flight_;
 
+  // BrowserPlugin outlives RenderViewImpl in Chrome Apps and so we need to
+  // store the BrowserPlugin's BrowserPluginManager in a member variable to
+  // avoid accessing the RenderViewImpl.
+  scoped_refptr<BrowserPluginManager> browser_plugin_manager_;
+
   // Important: Do not add more history state here.
   // We strongly discourage storing additional history state (such as page IDs)
   // in the embedder process, at the risk of having incorrect information that
   // can lead to broken back/forward logic in apps.
   // It's also important that this state does not get modified by any logic in
   // the embedder process. It should only be updated in response to navigation
   // events in the guest.  No assumptions should be made about how the index
   // will change after a navigation (e.g., for back, forward, or go), because
   // the changes are not always obvious.  For example, there is a maximum
   // number of entries and earlier ones will automatically be pruned.
   int current_nav_entry_index_;
   int nav_entry_count_;
   DISALLOW_COPY_AND_ASSIGN(BrowserPlugin);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_H_