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

Unified Diff: trunk/src/extensions/renderer/extension_helper.cc

Issue 307933008: Revert 273866 "Block content scripts from executing until user g..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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 | « trunk/src/extensions/renderer/extension_helper.h ('k') | trunk/src/extensions/renderer/script_injection.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/extensions/renderer/extension_helper.cc
===================================================================
--- trunk/src/extensions/renderer/extension_helper.cc (revision 274101)
+++ trunk/src/extensions/renderer/extension_helper.cc (working copy)
@@ -158,9 +158,7 @@
IPC_MESSAGE_HANDLER(ExtensionMsg_AddMessageToConsole,
OnAddMessageToConsole)
IPC_MESSAGE_HANDLER(ExtensionMsg_AppWindowClosed,
- OnAppWindowClosed)
- IPC_MESSAGE_HANDLER(ExtensionMsg_GrantContentScriptPermission,
- OnGrantContentScriptPermission)
+ OnAppWindowClosed);
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
return handled;
@@ -219,8 +217,6 @@
delete i->second;
g_schedulers.Get().erase(i);
-
- dispatcher_->user_script_slave()->FrameDetached(frame);
}
void ExtensionHelper::DidMatchCSS(
@@ -350,9 +346,4 @@
"onAppWindowClosed");
}
-void ExtensionHelper::OnGrantContentScriptPermission(int request_id) {
- dispatcher_->user_script_slave()->OnContentScriptGrantedPermission(
- render_view(), request_id);
-}
-
} // namespace extensions
« no previous file with comments | « trunk/src/extensions/renderer/extension_helper.h ('k') | trunk/src/extensions/renderer/script_injection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698