diff options
| author | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-26 02:58:15 +0000 |
|---|---|---|
| committer | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-26 02:58:15 +0000 |
| commit | 7bc5f1bb093daa602ac483051bd0071f8064779b (patch) | |
| tree | 8e6477758b86742c8cc1db6dd5febb3b07762d57 /chrome/browser/renderer_host/resource_dispatcher_host.cc | |
| parent | cdbc184570cbc8e2838d45e810bc68ef66b7347f (diff) | |
| download | chromium_src-7bc5f1bb093daa602ac483051bd0071f8064779b.zip chromium_src-7bc5f1bb093daa602ac483051bd0071f8064779b.tar.gz chromium_src-7bc5f1bb093daa602ac483051bd0071f8064779b.tar.bz2 | |
Revert 24372 - Delay request loading until all user scripts that request depends on are ready.
BUG=11547
TEST=See bug.
Review URL: http://codereview.chromium.org/173239
TBR=mpcomplete@chromium.org
Review URL: http://codereview.chromium.org/174501
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24419 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host/resource_dispatcher_host.cc')
| -rw-r--r-- | chrome/browser/renderer_host/resource_dispatcher_host.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.cc b/chrome/browser/renderer_host/resource_dispatcher_host.cc index b205fd0..0066ad6 100644 --- a/chrome/browser/renderer_host/resource_dispatcher_host.cc +++ b/chrome/browser/renderer_host/resource_dispatcher_host.cc @@ -21,7 +21,6 @@ #include "chrome/browser/download/download_manager.h" #include "chrome/browser/download/download_request_manager.h" #include "chrome/browser/download/save_file_manager.h" -#include "chrome/browser/extensions/user_script_listener.h" #include "chrome/browser/external_protocol_handler.h" #include "chrome/browser/in_process_webkit/webkit_thread.h" #include "chrome/browser/login_prompt.h" @@ -253,8 +252,6 @@ ResourceDispatcherHost::ResourceDispatcherHost(MessageLoop* io_loop) download_request_manager_(new DownloadRequestManager(io_loop, ui_loop_)), ALLOW_THIS_IN_INITIALIZER_LIST( save_file_manager_(new SaveFileManager(ui_loop_, io_loop, this))), - ALLOW_THIS_IN_INITIALIZER_LIST(user_script_listener_( - new UserScriptListener(ui_loop_, io_loop, this))), safe_browsing_(new SafeBrowsingService), webkit_thread_(new WebKitThread), request_id_(-1), @@ -285,8 +282,6 @@ ResourceDispatcherHost::~ResourceDispatcherHost() { iter != ids.end(); ++iter) { CancelBlockedRequestsForRoute(iter->first, iter->second); } - - user_script_listener_->OnResourceDispatcherHostGone(); } void ResourceDispatcherHost::Initialize() { @@ -1252,11 +1247,6 @@ void ResourceDispatcherHost::BeginRequestInternal(URLRequest* request) { // its content should be filtered) and start it itself. return; } - if (!user_script_listener_->ShouldStartRequest(request)) { - // This request depends on some user scripts that haven't loaded yet. The - // UserScriptListener will resume the request when they're ready. - return; - } request->Start(); // Make sure we have the load state monitor running |