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

Unified Diff: chrome/renderer/extensions/event_bindings.cc

Issue 7727004: Initialize content scripts the same way extension scripts are. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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: chrome/renderer/extensions/event_bindings.cc
diff --git a/chrome/renderer/extensions/event_bindings.cc b/chrome/renderer/extensions/event_bindings.cc
index cdebf12b2d7c7ee93e2f19a0131c387ab21c92d1..65be348470c8a1688c2d37cef634b9b4c5ce4de2 100644
--- a/chrome/renderer/extensions/event_bindings.cc
+++ b/chrome/renderer/extensions/event_bindings.cc
@@ -12,6 +12,7 @@
#include "chrome/common/extensions/extension_messages.h"
#include "chrome/common/extensions/extension_set.h"
#include "chrome/common/url_constants.h"
+#include "chrome/renderer/chrome_render_process_observer.h"
#include "chrome/renderer/extensions/bindings_utils.h"
#include "chrome/renderer/extensions/event_bindings.h"
#include "chrome/renderer/extensions/extension_dispatcher.h"
@@ -338,13 +339,13 @@ void EventBindings::HandleContextCreated(
contexts.push_back(linked_ptr<ContextInfo>(
new ContextInfo(persistent_context, main_world_context, extension_id)));
- // Content scripts get initialized in user_script_slave.cc.
- if (!content_script) {
- v8::HandleScope handle_scope;
- v8::Handle<v8::Value> argv[1];
- argv[0] = v8::String::New(extension_id.c_str());
- CallFunctionInContext(context, "dispatchOnLoad", arraysize(argv), argv);
- }
+ v8::HandleScope handle_scope;
+ v8::Handle<v8::Value> argv[3];
+ argv[0] = v8::String::New(extension_id.c_str());
+ argv[1] = v8::Boolean::New(extension_dispatcher->is_extension_process());
+ argv[2] = v8::Boolean::New(
+ ChromeRenderProcessObserver::is_incognito_process());
+ CallFunctionInContext(context, "dispatchOnLoad", arraysize(argv), argv);
}
// static

Powered by Google App Engine
This is Rietveld 408576698