Move the dispatching of extension messages out of RenderThread. This also moves a bunch of exten...

content/renderer/render_view.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 30 matching lines @@
 #include "chrome/common/url_constants.h"
 #include "chrome/common/web_apps.h"
 #include "chrome/renderer/about_handler.h"
 #include "chrome/renderer/autofill/autofill_agent.h"
 #include "chrome/renderer/autofill/form_manager.h"
 #include "chrome/renderer/autofill/password_autofill_manager.h"
 #include "chrome/renderer/automation/dom_automation_controller.h"
 #include "chrome/renderer/devtools_agent.h"
 #include "chrome/renderer/devtools_client.h"
 #include "chrome/renderer/extension_groups.h"
-#include "chrome/renderer/extensions/bindings_utils.h"
 #include "chrome/renderer/extensions/event_bindings.h"
+#include "chrome/renderer/extensions/extension_dispatcher.h"
 #include "chrome/renderer/extensions/extension_helper.h"
 #include "chrome/renderer/extensions/extension_process_bindings.h"
 #include "chrome/renderer/extensions/extension_resource_request_policy.h"
 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
 #include "chrome/renderer/external_host_bindings.h"
 #include "chrome/renderer/localized_error.h"
 #include "chrome/renderer/page_click_tracker.h"
 #include "chrome/renderer/page_load_histograms.h"
 #include "chrome/renderer/print_web_view_helper.h"
 #include "chrome/renderer/render_process.h"
@@ skipping 2504 matching lines @@
 // created RenderView (i.e., as a constrained popup or as a new tab).
 //
 void RenderView::show(WebNavigationPolicy policy) {
   DCHECK(!did_show_) << "received extraneous Show call";
   DCHECK(opener_id_ != MSG_ROUTING_NONE);
 
   if (did_show_)
     return;
   did_show_ = true;
 
-  // Extensions and apps always allowed to create unrequested popups. The second
-  // check is necessary to include content scripts.
-  if (render_thread_->GetExtensions()->GetByURL(creator_url_) ||
-      bindings_utils::GetInfoForCurrentContext()) {
+  if (content::GetContentClient()->renderer()->AllowPopup(creator_url_))
     opened_by_user_gesture_ = true;
-  }
 
   // Force new windows to a popup if they were not opened with a user gesture.
   if (!opened_by_user_gesture_) {
     // We exempt background tabs for compat with older versions of Chrome.
     // TODO(darin): This seems bogus.  These should have a user gesture, so
     // we probably don't need this check.
     if (policy != WebKit::WebNavigationPolicyNewBackgroundTab)
       policy = WebKit::WebNavigationPolicyNewPopup;
   }
 
@@ skipping 231 matching lines @@
     // If the navigation would cross an app extent boundary, we also need
     // to defer to the browser to ensure process isolation.
     // TODO(erikkay) This is happening inside of a check to is_content_initiated
     // which means that things like the back button won't trigger it.  Is that
     // OK?
     // TODO(creis): For hosted apps, we currently only swap processes to enter
     // the app and not exit it, since we currently lose context (e.g.,
     // window.opener) if the window navigates back.  See crbug.com/65953.
     if (!should_fork &&
         CrossesExtensionExtents(
-            render_thread_->GetExtensions(),
-            frame,
-            url)) {
+            ExtensionDispatcher::Get()->extensions(), frame, url)) {
       // Include the referrer in this case since we're going from a hosted web
       // page. (the packaged case is handled previously by the extension
       // navigation test)
       should_fork = true;
       send_referrer = true;
 
       if (is_content_initiated) {
         const Extension* extension =
-            render_thread_->GetExtensions()->GetByURL(url);
+            ExtensionDispatcher::Get()->extensions()->GetByURL(url);
         if (extension && extension->is_app()) {
           UMA_HISTOGRAM_ENUMERATION(
               extension_misc::kAppLaunchHistogram,
               extension_misc::APP_LAUNCH_CONTENT_NAVIGATION,
               extension_misc::APP_LAUNCH_BUCKET_BOUNDARY);
         }
       }
     }
 
     if (should_fork) {
@@ skipping 445 matching lines @@
   }
   if (BindingsPolicy::is_external_host_enabled(enabled_bindings_)) {
     GetExternalHostBindings()->set_message_sender(this);
     GetExternalHostBindings()->set_routing_id(routing_id_);
     GetExternalHostBindings()->BindToJavascript(frame, "externalHost");
   }
 }
 
 void RenderView::didCreateDocumentElement(WebFrame* frame) {
   if (RenderThread::current()) {  // Will be NULL during unit tests.
-    RenderThread::current()->user_script_slave()->InjectScripts(
+    ExtensionDispatcher::Get()->user_script_slave()->InjectScripts(
         frame, UserScript::DOCUMENT_START);
   }
 
   // Notify the browser about non-blank documents loading in the top frame.
   GURL url = frame->url();
   if (url.is_valid() && url.spec() != chrome::kAboutBlankURL) {
     if (frame == webview()->mainFrame())
       Send(new ViewHostMsg_DocumentAvailableInMainFrame(routing_id_));
   }
 }
@@ skipping 22 matching lines @@
 
   Send(new ViewHostMsg_DocumentLoadedInFrame(routing_id_, frame->identifier()));
 
   FOR_EACH_OBSERVER(RenderViewObserver, observers_,
                     DidFinishDocumentLoad(frame));
 
   // Check whether we have new encoding name.
   UpdateEncoding(frame, frame->view()->pageEncoding().utf8());
 
   if (RenderThread::current()) {  // Will be NULL during unit tests.
-    RenderThread::current()->user_script_slave()->InjectScripts(
+    ExtensionDispatcher::Get()->user_script_slave()->InjectScripts(
         frame, UserScript::DOCUMENT_END);
   }
 
   // InjectScripts() can end up creating a new NavigationState if it triggers a
   // fragment navigation, so we need to re-fetch it here.
   navigation_state = NavigationState::FromDataSource(ds);
   navigation_state->user_script_idle_scheduler()->DidFinishDocumentLoad();
 }
 
 void RenderView::OnUserScriptIdleTriggered(WebFrame* frame) {
   if (RenderThread::current()) {  // Will be NULL during unit tests.
-    RenderThread::current()->user_script_slave()->InjectScripts(
+    ExtensionDispatcher::Get()->user_script_slave()->InjectScripts(
         frame, UserScript::DOCUMENT_IDLE);
   }
 
   WebFrame* main_frame = webview()->mainFrame();
   if (frame == main_frame) {
     while (!pending_code_execution_queue_.empty()) {
       linked_ptr<ExtensionMsg_ExecuteCode_Params>& params =
           pending_code_execution_queue_.front();
       ExecuteCodeImpl(main_frame, *params);
       pending_code_execution_queue_.pop();
@@ skipping 65 matching lines @@
       provisional_data_source ? provisional_data_source : top_data_source;
 
   // If the request is for an extension resource, check whether it should be
   // allowed. If not allowed, we reset the URL to something invalid to prevent
   // the request and cause an error.
   GURL request_url(request.url());
   if (request_url.SchemeIs(chrome::kExtensionScheme) &&
       !ExtensionResourceRequestPolicy::CanRequestResource(
           request_url,
           GURL(frame->url()),
-          render_thread_->GetExtensions())) {
+          ExtensionDispatcher::Get()->extensions())) {
     request.setURL(WebURL(GURL("chrome-extension://invalid/")));
   }
 
   if (data_source) {
     NavigationState* state = NavigationState::FromDataSource(data_source);
     if (state && state->is_cache_policy_override_set())
       request.setCachePolicy(state->cache_policy_override());
   }
 
   if (top_data_source) {
@@ skipping 1524 matching lines @@
   std::vector<WebFrame*> frame_vector;
   frame_vector.push_back(frame);
   if (params.all_frames)
     GetAllChildFrames(frame, &frame_vector);
 
   for (std::vector<WebFrame*>::iterator frame_it = frame_vector.begin();
        frame_it != frame_vector.end(); ++frame_it) {
     WebFrame* frame = *frame_it;
     if (params.is_javascript) {
       const Extension* extension =
-          render_thread_->GetExtensions()->GetByID(params.extension_id);
+          ExtensionDispatcher::Get()->extensions()->GetByID(
+              params.extension_id);
 
     // Since extension info is sent separately from user script info, they can
     // be out of sync. We just ignore this situation.
     if (!extension)
       continue;
 
       if (!extension->CanExecuteScriptOnPage(frame->url(), NULL, NULL))
         continue;
 
       std::vector<WebScriptSource> sources;
@@ skipping 366 matching lines @@
     const webkit_glue::CustomContextMenuContext& custom_context) {
   if (custom_context.is_pepper_menu)
     pepper_delegate_.OnContextMenuClosed(custom_context);
   else
     context_menu_node_.reset();
 }
 
 void RenderView::OnNetworkStateChanged(bool online) {
   WebNetworkStateNotifier::setOnLine(online);
 }