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

Unified Diff: trunk/src/extensions/renderer/dispatcher.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/dispatcher.h ('k') | trunk/src/extensions/renderer/extension_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/extensions/renderer/dispatcher.cc
===================================================================
--- trunk/src/extensions/renderer/dispatcher.cc (revision 274101)
+++ trunk/src/extensions/renderer/dispatcher.cc (working copy)
@@ -759,24 +759,9 @@
this, page_id, tab_id, extension_id, origin_set);
}
-void Dispatcher::OnUpdateUserScripts(
- base::SharedMemoryHandle scripts,
- const std::set<std::string>& extension_ids) {
- if (!base::SharedMemory::IsHandleValid(scripts)) {
- NOTREACHED() << "Bad scripts handle";
- return;
- }
-
- for (std::set<std::string>::const_iterator iter = extension_ids.begin();
- iter != extension_ids.end();
- ++iter) {
- if (!Extension::IdIsValid(*iter)) {
- NOTREACHED() << "Invalid extension id: " << *iter;
- return;
- }
- }
-
- user_script_slave_->UpdateScripts(scripts, extension_ids);
+void Dispatcher::OnUpdateUserScripts(base::SharedMemoryHandle scripts) {
+ DCHECK(base::SharedMemory::IsHandleValid(scripts)) << "Bad scripts handle";
+ user_script_slave_->UpdateScripts(scripts);
UpdateActiveExtensions();
}
« no previous file with comments | « trunk/src/extensions/renderer/dispatcher.h ('k') | trunk/src/extensions/renderer/extension_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698