| Index: content/browser/resource_context.cc
|
| diff --git a/content/browser/resource_context.cc b/content/browser/resource_context.cc
|
| index 97042466409c1b6b8fe4173ae53c30bcffdffe73..8fc7f0f039c1ec93c8c504987923f27f8fbdb467 100644
|
| --- a/content/browser/resource_context.cc
|
| +++ b/content/browser/resource_context.cc
|
| @@ -22,7 +22,8 @@ ResourceContext::ResourceContext()
|
| host_zoom_map_(NULL),
|
| media_observer_(NULL),
|
| media_stream_manager_(NULL),
|
| - audio_manager_(NULL) {
|
| + audio_manager_(NULL),
|
| + webkit_context_(NULL) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| }
|
|
|
| @@ -132,6 +133,17 @@ void ResourceContext::set_quota_manager(
|
| quota_manager_ = quota_manager;
|
| }
|
|
|
| +WebKitContext* ResourceContext::webkit_context() const {
|
| + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| + EnsureInitialized();
|
| + return webkit_context_;
|
| +}
|
| +
|
| +void ResourceContext::set_webkit_context(WebKitContext* webkit_context) {
|
| + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| + webkit_context_ = webkit_context;
|
| +}
|
| +
|
| HostZoomMap* ResourceContext::host_zoom_map() const {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| EnsureInitialized();
|
|
|