diff options
| author | kcwu <kcwu@chromium.org> | 2015-04-28 11:54:28 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-28 18:55:42 +0000 |
| commit | 213a4dbd5994d5aad53acb08e8960804bbffbc07 (patch) | |
| tree | 921c10648885fa8383ecd670ac6bc97dd014fdfd /chrome/browser/content_settings | |
| parent | c78f00838a4db55c89521b1606e26f134be8b0be (diff) | |
| download | chromium_src-213a4dbd5994d5aad53acb08e8960804bbffbc07.zip chromium_src-213a4dbd5994d5aad53acb08e8960804bbffbc07.tar.gz chromium_src-213a4dbd5994d5aad53acb08e8960804bbffbc07.tar.bz2 | |
Change ScopedPtrHashMap's 2nd template parameter
Now ScopedPtrHashMap expect the 2nd parameter is scoped_ptr<T>. For example, old usage
ScopedPtrHashMap<int, Value>
new usage
ScopedPtrHashMap<int, scoped_ptr<Value>>
With this change, ScopedPtrHashMap support scoped_ptr's custom deleter.
R=danakj@chromium.org, tzik@chromium.org
BUG=none
Review URL: https://codereview.chromium.org/1099383002
Cr-Commit-Position: refs/heads/master@{#327341}
Diffstat (limited to 'chrome/browser/content_settings')
| -rw-r--r-- | chrome/browser/content_settings/permission_context_base.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/content_settings/permission_context_base.h b/chrome/browser/content_settings/permission_context_base.h index e727ce9..0f24bee 100644 --- a/chrome/browser/content_settings/permission_context_base.h +++ b/chrome/browser/content_settings/permission_context_base.h @@ -130,7 +130,7 @@ class PermissionContextBase : public KeyedService { Profile* profile_; const ContentSettingsType permission_type_; scoped_ptr<PermissionQueueController> permission_queue_controller_; - base::ScopedPtrHashMap<std::string, PermissionBubbleRequest> + base::ScopedPtrHashMap<std::string, scoped_ptr<PermissionBubbleRequest>> pending_bubbles_; // Must be the last member, to ensure that it will be |