summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-02 00:35:58 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-02 00:35:58 +0000
commit347867b7b712fb62a5340da298b69f30e3443c49 (patch)
tree1f17c40edbd22ec9037755b7d0524cc757499e22 /chrome/browser/extensions
parent04e29603179d6f28ee6c83c4ff134879ead1549d (diff)
downloadchromium_src-347867b7b712fb62a5340da298b69f30e3443c49.zip
chromium_src-347867b7b712fb62a5340da298b69f30e3443c49.tar.gz
chromium_src-347867b7b712fb62a5340da298b69f30e3443c49.tar.bz2
Split ExtraRequestInfo out of ResourceDispatcherHost so it isn't cluttering up
that header file. I added documentation and split out the accessors according to Google-style. BUG=none TEST=none Review URL: http://codereview.chromium.org/179046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25133 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/user_script_listener.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/extensions/user_script_listener.cc b/chrome/browser/extensions/user_script_listener.cc
index 086fc38..cc77296 100644
--- a/chrome/browser/extensions/user_script_listener.cc
+++ b/chrome/browser/extensions/user_script_listener.cc
@@ -6,6 +6,7 @@
#include "base/message_loop.h"
#include "chrome/browser/extensions/extensions_service.h"
+#include "chrome/browser/renderer_host/resource_dispatcher_host_request_info.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/notification_service.h"
#include "net/url_request/url_request.h"
@@ -38,12 +39,12 @@ bool UserScriptListener::ShouldStartRequest(URLRequest* request) {
// If it's a frame load, then we need to check the URL against the list of
// user scripts to see if we need to wait.
- ResourceDispatcherHost::ExtraRequestInfo* info =
- ResourceDispatcherHost::ExtraInfoForRequest(request);
+ ResourceDispatcherHostRequestInfo* info =
+ ResourceDispatcherHost::InfoForRequest(request);
DCHECK(info);
- if (info->resource_type != ResourceType::MAIN_FRAME &&
- info->resource_type != ResourceType::SUB_FRAME) {
+ if (info->resource_type() != ResourceType::MAIN_FRAME &&
+ info->resource_type() != ResourceType::SUB_FRAME) {
return true;
}
@@ -66,7 +67,7 @@ bool UserScriptListener::ShouldStartRequest(URLRequest* request) {
// Queue this request up.
delayed_request_ids_.push_front(ResourceDispatcherHost::GlobalRequestID(
- info->child_id, info->request_id));
+ info->child_id(), info->request_id()));
return false;
}