diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-20 22:58:21 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-20 22:58:21 +0000 |
commit | 5b9f0b5728cb96511a69bd735dc3620ed118f115 (patch) | |
tree | f349b832a2087b3c46ec60bd8acebf890662c4b4 /content | |
parent | 6b626b910ddbabe6e78f93bbdb2d6f628882910b (diff) | |
download | chromium_src-5b9f0b5728cb96511a69bd735dc3620ed118f115.zip chromium_src-5b9f0b5728cb96511a69bd735dc3620ed118f115.tar.gz chromium_src-5b9f0b5728cb96511a69bd735dc3620ed118f115.tar.bz2 |
Attached data cleanup.
Clean up comments on SupportsUserData.
Fix typos in ResourceContextImpl.
Remove use of PropertyBag from ExtensionService as it hasn't been used since r135419.
Remove use of PropertyBag from RenderWidgetHostImpl as it hasn't been used since r83122.
BUG=141177
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10824342
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152421 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r-- | content/browser/renderer_host/render_widget_host_impl.h | 10 | ||||
-rw-r--r-- | content/browser/resource_context_impl.cc | 6 |
2 files changed, 3 insertions, 13 deletions
diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h index fc63e54..9475d99 100644 --- a/content/browser/renderer_host/render_widget_host_impl.h +++ b/content/browser/renderer_host/render_widget_host_impl.h @@ -15,7 +15,6 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/process_util.h" -#include "base/property_bag.h" #include "base/string16.h" #include "base/timer.h" #include "build/build_config.h" @@ -132,12 +131,6 @@ class CONTENT_EXPORT RenderWidgetHostImpl : virtual public RenderWidgetHost, bool empty() const { return current_size_.IsEmpty(); } - // Returns the property bag for this widget, where callers can add extra data - // they may wish to associate with it. Returns a pointer rather than a - // reference since the PropertyAccessors expect this. - const base::PropertyBag* property_bag() const { return &property_bag_; } - base::PropertyBag* property_bag() { return &property_bag_; } - // Called when a renderer object already been created for this host, and we // just need to be attached to it. Used for window.open, <select> dropdown // menus, and other times when the renderer initiates creating an object. @@ -628,9 +621,6 @@ class CONTENT_EXPORT RenderWidgetHostImpl : virtual public RenderWidgetHost, // The ID of the corresponding object in the Renderer Instance. int routing_id_; - // Stores random bits of data for others to associate with this object. - base::PropertyBag property_bag_; - // The ID of the surface corresponding to this render widget. int surface_id_; diff --git a/content/browser/resource_context_impl.cc b/content/browser/resource_context_impl.cc index 2a143f1..f0ebf0f 100644 --- a/content/browser/resource_context_impl.cc +++ b/content/browser/resource_context_impl.cc @@ -30,7 +30,7 @@ #include "webkit/fileapi/file_system_url_request_job_factory.h" // Key names on ResourceContext. -static const char* kAppCacheServicKeyName = "content_appcache_service_tracker"; +static const char* kAppCacheServiceKeyName = "content_appcache_service_tracker"; static const char* kBlobStorageContextKeyName = "content_blob_storage_context"; static const char* kDatabaseTrackerKeyName = "content_database_tracker"; static const char* kFileSystemContextKeyName = "content_file_system_context"; @@ -184,7 +184,7 @@ void InitializeRequestContext( AppCacheService* ResourceContext::GetAppCacheService(ResourceContext* context) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); return UserDataAdapter<ChromeAppCacheService>::Get( - context, kAppCacheServicKeyName); + context, kAppCacheServiceKeyName); } ResourceContext::ResourceContext() { @@ -255,7 +255,7 @@ void InitializeResourceContext(BrowserContext* browser_context) { new UserDataAdapter<webkit_database::DatabaseTracker>( BrowserContext::GetDatabaseTracker(browser_context))); resource_context->SetUserData( - kAppCacheServicKeyName, + kAppCacheServiceKeyName, new UserDataAdapter<ChromeAppCacheService>( static_cast<ChromeAppCacheService*>( BrowserContext::GetAppCacheService(browser_context)))); |