summaryrefslogtreecommitdiffstats
path: root/webkit/appcache
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-15 22:07:34 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-15 22:07:34 +0000
commitea8e1813f4dec2371093983e7503aae2d591c1e4 (patch)
tree102acfab138debea374a8d0e850d872bf98adcef /webkit/appcache
parentea93125d7961a09ba90d44a9c3013483399a2051 (diff)
downloadchromium_src-ea8e1813f4dec2371093983e7503aae2d591c1e4.zip
chromium_src-ea8e1813f4dec2371093983e7503aae2d591c1e4.tar.gz
chromium_src-ea8e1813f4dec2371093983e7503aae2d591c1e4.tar.bz2
Add extra data to BrowserContext so that content layer and other embedders can stash data with it that has the same lifetime. Converted SSLHostState to use it for now. I'll do the rest in a followup.
BUG=98716 Review URL: https://chromiumcodereview.appspot.com/9348109 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122164 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/appcache')
-rw-r--r--webkit/appcache/appcache_host.cc1
-rw-r--r--webkit/appcache/appcache_request_handler.h4
2 files changed, 3 insertions, 2 deletions
diff --git a/webkit/appcache/appcache_host.cc b/webkit/appcache/appcache_host.cc
index ff0cb3e..61ff5be 100644
--- a/webkit/appcache/appcache_host.cc
+++ b/webkit/appcache/appcache_host.cc
@@ -7,6 +7,7 @@
#include "base/logging.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
+#include "net/url_request/url_request.h"
#include "webkit/appcache/appcache.h"
#include "webkit/appcache/appcache_backend_impl.h"
#include "webkit/appcache/appcache_policy.h"
diff --git a/webkit/appcache/appcache_request_handler.h b/webkit/appcache/appcache_request_handler.h
index 6f45358..f7e8c23 100644
--- a/webkit/appcache/appcache_request_handler.h
+++ b/webkit/appcache/appcache_request_handler.h
@@ -6,7 +6,7 @@
#define WEBKIT_APPCACHE_APPCACHE_REQUEST_HANDLER_H_
#include "base/compiler_specific.h"
-#include "net/url_request/url_request.h"
+#include "base/supports_user_data.h"
#include "webkit/appcache/appcache_entry.h"
#include "webkit/appcache/appcache_export.h"
#include "webkit/appcache/appcache_host.h"
@@ -27,7 +27,7 @@ class AppCacheURLRequestJob;
// should use AppCacheHost::CreateRequestHandler to manufacture instances
// that can retrieve resources for a particular host.
class APPCACHE_EXPORT AppCacheRequestHandler
- : NON_EXPORTED_BASE(public net::URLRequest::UserData),
+ : public base::SupportsUserData::Data,
public AppCacheHost::Observer,
public AppCacheStorage::Delegate {
public: