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

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

Issue 11035067: Add loadCommit and loadStop Event (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Merge Conflict Created 8 years, 2 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 a88b34f4dbc87537ee9df054b1f69a5366c91eb4..79b9323a23fb717ee36717e48513a2259fccfac7 100644
--- a/content/renderer/browser_plugin/browser_plugin_manager_impl.cc
+++ b/content/renderer/browser_plugin/browser_plugin_manager_impl.cc
@@ -37,13 +37,14 @@ bool BrowserPluginManagerImpl::OnControlMessageReceived(
IPC_BEGIN_MESSAGE_MAP(BrowserPluginManagerImpl, message)
IPC_MESSAGE_HANDLER(BrowserPluginMsg_UpdateRect, OnUpdateRect)
IPC_MESSAGE_HANDLER(BrowserPluginMsg_GuestCrashed, OnGuestCrashed)
- IPC_MESSAGE_HANDLER(BrowserPluginMsg_DidNavigate, OnDidNavigate)
IPC_MESSAGE_HANDLER(BrowserPluginMsg_AdvanceFocus, OnAdvanceFocus)
IPC_MESSAGE_HANDLER(BrowserPluginMsg_ShouldAcceptTouchEvents,
OnShouldAcceptTouchEvents)
IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadStart, OnLoadStart)
IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadAbort, OnLoadAbort)
IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadRedirect, OnLoadRedirect)
+ IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadCommit, OnLoadCommit)
+ IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadStop, OnLoadStop)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
return handled;
@@ -64,14 +65,6 @@ void BrowserPluginManagerImpl::OnGuestCrashed(int instance_id) {
plugin->GuestCrashed();
}
-void BrowserPluginManagerImpl::OnDidNavigate(
- int instance_id,
- const BrowserPluginMsg_DidNavigate_Params& params) {
- BrowserPlugin* plugin = GetBrowserPlugin(instance_id);
- if (plugin)
- plugin->DidNavigate(params);
-}
-
void BrowserPluginManagerImpl::OnAdvanceFocus(int instance_id, bool reverse) {
BrowserPlugin* plugin = GetBrowserPlugin(instance_id);
if (plugin)
@@ -93,6 +86,20 @@ void BrowserPluginManagerImpl::OnLoadStart(int instance_id,
plugin->LoadStart(url, is_top_level);
}
+void BrowserPluginManagerImpl::OnLoadCommit(
+ int instance_id,
+ const BrowserPluginMsg_LoadCommit_Params& params) {
+ BrowserPlugin* plugin = GetBrowserPlugin(instance_id);
+ if (plugin)
+ plugin->LoadCommit(params);
+}
+
+void BrowserPluginManagerImpl::OnLoadStop(int instance_id) {
+ BrowserPlugin* plugin = GetBrowserPlugin(instance_id);
+ if (plugin)
+ plugin->LoadStop();
+}
+
void BrowserPluginManagerImpl::OnLoadAbort(int instance_id,
const GURL& url,
bool is_top_level,

Powered by Google App Engine
This is Rietveld 408576698