| Index: chrome/browser/profiles/profile_io_data.h
|
| diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
|
| index c23462648a395e7c855500032ebb40c685dd1d72..5c7e4a0fe51c93ebc8fd0d4f3bf7ec9d3e32d637 100644
|
| --- a/chrome/browser/profiles/profile_io_data.h
|
| +++ b/chrome/browser/profiles/profile_io_data.h
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -31,6 +31,7 @@ class IOThread;
|
| class Profile;
|
| class ProtocolHandlerRegistry;
|
| class TransportSecurityPersister;
|
| +class WebKitContext;
|
|
|
| namespace fileapi {
|
| class FileSystemContext;
|
| @@ -157,6 +158,7 @@ class ProfileIOData {
|
| scoped_refptr<ChromeAppCacheService> appcache_service;
|
| scoped_refptr<ChromeBlobStorageContext> blob_storage_context;
|
| scoped_refptr<fileapi::FileSystemContext> file_system_context;
|
| + scoped_refptr<WebKitContext> webkit_context;
|
| scoped_refptr<quota::QuotaManager> quota_manager;
|
| scoped_refptr<ExtensionInfoMap> extension_info_map;
|
| DesktopNotificationService* notification_service;
|
| @@ -241,6 +243,7 @@ class ProfileIOData {
|
| virtual MediaObserver* GetMediaObserver() OVERRIDE;
|
| virtual media_stream::MediaStreamManager* GetMediaStreamManager() OVERRIDE;
|
| virtual AudioManager* GetAudioManager() OVERRIDE;
|
| + virtual WebKitContext* GetWebKitContext() OVERRIDE;
|
|
|
| void EnsureInitialized();
|
|
|
| @@ -257,6 +260,7 @@ class ProfileIOData {
|
| MediaObserver* media_observer_;
|
| media_stream::MediaStreamManager* media_stream_manager_;
|
| AudioManager* audio_manager_;
|
| + WebKitContext* webkit_context_;
|
| };
|
|
|
| typedef base::hash_map<std::string, scoped_refptr<ChromeURLRequestContext> >
|
| @@ -316,6 +320,7 @@ class ProfileIOData {
|
| mutable scoped_refptr<ChromeAppCacheService> appcache_service_;
|
| mutable scoped_refptr<ChromeBlobStorageContext> blob_storage_context_;
|
| mutable scoped_refptr<fileapi::FileSystemContext> file_system_context_;
|
| + mutable scoped_refptr<WebKitContext> webkit_context_;
|
| mutable scoped_refptr<quota::QuotaManager> quota_manager_;
|
| mutable scoped_refptr<content::HostZoomMap> host_zoom_map_;
|
| mutable scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_;
|
|
|