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

Unified Diff: content/renderer/browser_plugin/browser_plugin_manager_impl.cc

Issue 444813002: Remove BrowserPlugin's -internal-attach method (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Don't crash on tear down Created 6 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
Index: content/renderer/browser_plugin/browser_plugin_manager_impl.cc
diff --git a/content/renderer/browser_plugin/browser_plugin_manager_impl.cc b/content/renderer/browser_plugin/browser_plugin_manager_impl.cc
index 54f557a6082b1be6b580b37ecf08c5ad89056abb..8ada74e62c16343ae96c63f586b95aa1ac568766 100644
--- a/content/renderer/browser_plugin/browser_plugin_manager_impl.cc
+++ b/content/renderer/browser_plugin/browser_plugin_manager_impl.cc
@@ -34,13 +34,13 @@ bool BrowserPluginManagerImpl::Send(IPC::Message* msg) {
bool BrowserPluginManagerImpl::OnMessageReceived(
const IPC::Message& message) {
if (BrowserPlugin::ShouldForwardToBrowserPlugin(message)) {
- int guest_instance_id = browser_plugin::kInstanceIDNone;
- // All allowed messages must have |guest_instance_id| as their first
- // parameter.
+ int browser_plugin_instance_id = browser_plugin::kInstanceIDNone;
+ // All allowed messages must have |browser_plugin_instance_id| as their
+ // first parameter.
PickleIterator iter(message);
- bool success = iter.ReadInt(&guest_instance_id);
+ bool success = iter.ReadInt(&browser_plugin_instance_id);
DCHECK(success);
- BrowserPlugin* plugin = GetBrowserPlugin(guest_instance_id);
+ BrowserPlugin* plugin = GetBrowserPlugin(browser_plugin_instance_id);
if (plugin && plugin->OnMessageReceived(message))
return true;
}

Powered by Google App Engine
This is Rietveld 408576698