| 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
|
|
|