Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2885)

Unified Diff: content/renderer/browser_plugin/browser_plugin.h

Issue 21930006: <webview>: Allocate the view instance ID from the WebView shim (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge with ToT Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/browser/content_browser_client.h ('k') | content/renderer/browser_plugin/browser_plugin.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/browser_plugin/browser_plugin.h
diff --git a/content/renderer/browser_plugin/browser_plugin.h b/content/renderer/browser_plugin/browser_plugin.h
index f0e695cf31faf36e33aa67f854394aacdd42a72a..673066287c2aadf8ab7fd233801e281e9286a0d0 100644
--- a/content/renderer/browser_plugin/browser_plugin.h
+++ b/content/renderer/browser_plugin/browser_plugin.h
@@ -40,7 +40,6 @@ class CONTENT_EXPORT BrowserPlugin :
RenderViewImpl* render_view() const { return render_view_.get(); }
int render_view_routing_id() const { return render_view_routing_id_; }
int guest_instance_id() const { return guest_instance_id_; }
- int instance_id() const { return instance_id_; }
static BrowserPlugin* FromContainer(WebKit::WebPluginContainer* container);
@@ -219,8 +218,7 @@ class CONTENT_EXPORT BrowserPlugin :
BrowserPlugin(
RenderViewImpl* render_view,
WebKit::WebFrame* frame,
- const WebKit::WebPluginParams& params,
- int instance_id);
+ const WebKit::WebPluginParams& params);
virtual ~BrowserPlugin();
@@ -336,9 +334,6 @@ class CONTENT_EXPORT BrowserPlugin :
// This is the browser-process-allocated instance ID that uniquely identifies
// a guest WebContents.
int guest_instance_id_;
- // This is a render-process-allocated instance ID that uniquely identifies a
- // BrowserPlugin.
- int instance_id_;
base::WeakPtr<RenderViewImpl> render_view_;
// We cache the |render_view_|'s routing ID because we need it on destruction.
// If the |render_view_| is destroyed before the BrowserPlugin is destroyed
« no previous file with comments | « content/public/browser/content_browser_client.h ('k') | content/renderer/browser_plugin/browser_plugin.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698