| Index: chrome/browser/extensions/extension_prefs.h
|
| diff --git a/chrome/browser/extensions/extension_prefs.h b/chrome/browser/extensions/extension_prefs.h
|
| index 096d861e720465103646884c04dcd5c6fc7cae7e..1cd9eb193ce1d3aa7bd0065e7612602cfa234b67 100644
|
| --- a/chrome/browser/extensions/extension_prefs.h
|
| +++ b/chrome/browser/extensions/extension_prefs.h
|
| @@ -346,8 +346,6 @@ class ExtensionPrefs : public ExtensionContentSettingsStore::Observer {
|
| const std::string& extension_id,
|
| bool incognito) OVERRIDE;
|
|
|
| - virtual void OnDestruction() OVERRIDE {}
|
| -
|
| // Converts absolute paths in the pref to paths relative to the
|
| // install_directory_.
|
| void MakePathsRelative();
|
| @@ -443,7 +441,7 @@ class ExtensionPrefs : public ExtensionContentSettingsStore::Observer {
|
| // Weak pointer, owned by Profile.
|
| ExtensionPrefValueMap* extension_pref_value_map_;
|
|
|
| - scoped_ptr<ExtensionContentSettingsStore> content_settings_store_;
|
| + scoped_refptr<ExtensionContentSettingsStore> content_settings_store_;
|
|
|
| // The URLs of all of the toolstrips.
|
| URLList shelf_order_;
|
|
|