diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-10 20:04:35 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-10 20:04:35 +0000 |
| commit | 92b24c11f42b31158cca43921eac16f33c98839c (patch) | |
| tree | 81304558304a29fb589327af857db90294f17fc8 /chrome/browser/ssl | |
| parent | 8eadc12f4690e648e11b5f84733da84f2f8825a8 (diff) | |
| download | chromium_src-92b24c11f42b31158cca43921eac16f33c98839c.zip chromium_src-92b24c11f42b31158cca43921eac16f33c98839c.tar.gz chromium_src-92b24c11f42b31158cca43921eac16f33c98839c.tar.bz2 | |
Implement ResourceQueue, an object that makes it easy to delay starting
requests in ResourceDispatcherHost until specified conditions are met.
Make UserScriptListener use ResourceQueue.
This is the first step toward waiting for the privacy blacklists to load.
TEST=Covered by unit_tests.
BUG=21541
Review URL: http://codereview.chromium.org/460108
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34271 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl')
| -rw-r--r-- | chrome/browser/ssl/ssl_cert_error_handler.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/ssl/ssl_error_handler.h | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/ssl/ssl_cert_error_handler.cc b/chrome/browser/ssl/ssl_cert_error_handler.cc index 1bb0c4d..d7dddf1 100644 --- a/chrome/browser/ssl/ssl_cert_error_handler.cc +++ b/chrome/browser/ssl/ssl_cert_error_handler.cc @@ -4,6 +4,7 @@ #include "chrome/browser/ssl/ssl_cert_error_handler.h" +#include "chrome/browser/renderer_host/resource_dispatcher_host.h" #include "chrome/browser/ssl/ssl_manager.h" #include "chrome/browser/ssl/ssl_policy.h" diff --git a/chrome/browser/ssl/ssl_error_handler.h b/chrome/browser/ssl/ssl_error_handler.h index cc80234..2589f5d 100644 --- a/chrome/browser/ssl/ssl_error_handler.h +++ b/chrome/browser/ssl/ssl_error_handler.h @@ -9,12 +9,13 @@ #include "base/basictypes.h" #include "base/ref_counted.h" +#include "chrome/browser/renderer_host/global_request_id.h" #include "chrome/browser/ssl/ssl_manager.h" -#include "chrome/browser/renderer_host/resource_dispatcher_host.h" #include "chrome/common/filter_policy.h" #include "googleurl/src/gurl.h" #include "webkit/glue/resource_type.h" +class ResourceDispatcherHost; class SSLCertErrorHandler; class TabContents; class URLRequest; @@ -113,7 +114,7 @@ class SSLErrorHandler : public base::RefCountedThreadSafe<SSLErrorHandler> { // The id of the URLRequest associated with this object. // Should only be accessed from the IO thread. - ResourceDispatcherHost::GlobalRequestID request_id_; + GlobalRequestID request_id_; // The ResourceDispatcherHost we are associated with. ResourceDispatcherHost* resource_dispatcher_host_; |