diff options
author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-27 20:15:51 +0000 |
---|---|---|
committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-27 20:15:51 +0000 |
commit | e889527113d18e0cf1e663cc7ec341cf3302fcdb (patch) | |
tree | 3e100b015da1ef1a7d15f341973552722c71229b /chrome/browser/extensions/extension_service.cc | |
parent | 8396196fbdf85a05ff666f7d6b1ee3fb94458deb (diff) | |
download | chromium_src-e889527113d18e0cf1e663cc7ec341cf3302fcdb.zip chromium_src-e889527113d18e0cf1e663cc7ec341cf3302fcdb.tar.gz chromium_src-e889527113d18e0cf1e663cc7ec341cf3302fcdb.tar.bz2 |
Remove DestroyingProfile from a few places.
These guys are both non-refcounted and have a lifetime that is
exactly equivalent to Profile.
The DestroyingProfile code dates to a time when
ExtensionService was ref-counted.
Review URL: http://codereview.chromium.org/6905050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83198 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_service.cc')
-rw-r--r-- | chrome/browser/extensions/extension_service.cc | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index 0462912..52d24fe 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -507,7 +507,6 @@ PendingExtensionManager* ExtensionService::pending_extension_manager() { } ExtensionService::~ExtensionService() { - CHECK(!profile_); // Profile should have told us it's going away. UnloadAllExtensions(); ProviderCollection::const_iterator i; @@ -1226,19 +1225,6 @@ Profile* ExtensionService::profile() { return profile_; } -void ExtensionService::DestroyingProfile() { - if (updater_.get()) { - updater_->Stop(); - } - browser_event_router_.reset(); - preference_event_router_.reset(); - pref_change_registrar_.RemoveAll(); - profile_ = NULL; - toolbar_model_.DestroyingProfile(); - method_factory_.RevokeAll(); - weak_ptr_factory_.InvalidateWeakPtrs(); -} - ExtensionPrefs* ExtensionService::extension_prefs() { return extension_prefs_; } |