diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-20 08:47:37 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-20 08:47:37 +0000 |
| commit | 916b78c371bdc95769d001c192ab6016cc0ae6c4 (patch) | |
| tree | e68bfdeec237056176ca257bf7244d5eecba5bf6 /chrome/browser/content_exceptions_table_model.h | |
| parent | 6849fd9c1d7296744df5a10a03060138f104c3db (diff) | |
| download | chromium_src-916b78c371bdc95769d001c192ab6016cc0ae6c4.zip chromium_src-916b78c371bdc95769d001c192ab6016cc0ae6c4.tar.gz chromium_src-916b78c371bdc95769d001c192ab6016cc0ae6c4.tar.bz2 | |
Refcount the host content settings map from the content exceptions table model.
Otherwise, we run into a problem when the incognito profile goes away while the user is editing exceptions.
BUG=51959
TEST=ContentExceptionsTableModelTest.*
Review URL: http://codereview.chromium.org/3446013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59915 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_exceptions_table_model.h')
| -rw-r--r-- | chrome/browser/content_exceptions_table_model.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/content_exceptions_table_model.h b/chrome/browser/content_exceptions_table_model.h index f30633f..8e29591 100644 --- a/chrome/browser/content_exceptions_table_model.h +++ b/chrome/browser/content_exceptions_table_model.h @@ -9,6 +9,7 @@ #include <string> #include "app/table_model.h" +#include "base/ref_counted.h" #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_types.h" #include "chrome/browser/host_content_settings_map.h" @@ -63,8 +64,8 @@ class ContentExceptionsTableModel : public TableModel { return is_off_the_record ? off_the_record_entries_ : entries_; } - HostContentSettingsMap* map_; - HostContentSettingsMap* off_the_record_map_; + scoped_refptr<HostContentSettingsMap> map_; + scoped_refptr<HostContentSettingsMap> off_the_record_map_; ContentSettingsType content_type_; HostContentSettingsMap::SettingsForOneType entries_; HostContentSettingsMap::SettingsForOneType off_the_record_entries_; |