diff options
Diffstat (limited to 'chrome/browser/extensions/api/preference')
-rw-r--r-- | chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc | 6 | ||||
-rw-r--r-- | chrome/browser/extensions/api/preference/preference_api.cc | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc b/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc index 4d39671..520f4fa 100644 --- a/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc +++ b/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc @@ -9,6 +9,7 @@ #include "base/lazy_instance.h" #include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" +#include "base/profiler/scoped_profile.h" #include "base/strings/stringprintf.h" #include "chrome/browser/extensions/api/preference/preference_api_constants.h" #include "chrome/browser/extensions/extension_service.h" @@ -93,6 +94,11 @@ ChromeDirectSettingAPI::GetFactoryInstance() { // EventRouter::Observer implementation. void ChromeDirectSettingAPI::OnListenerAdded(const EventListenerInfo& details) { + // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed. + tracked_objects::ScopedProfile tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "ChromeDirectSettingAPI::OnListenerAdded")); + EventRouter::Get(profile_)->UnregisterObserver(this); registrar_.Init(profile_->GetPrefs()); preference_whitelist.Get().RegisterPropertyListeners( diff --git a/chrome/browser/extensions/api/preference/preference_api.cc b/chrome/browser/extensions/api/preference/preference_api.cc index 1eeb6f0..c4cf8a6 100644 --- a/chrome/browser/extensions/api/preference/preference_api.cc +++ b/chrome/browser/extensions/api/preference/preference_api.cc @@ -10,6 +10,7 @@ #include "base/lazy_instance.h" #include "base/memory/singleton.h" #include "base/prefs/pref_service.h" +#include "base/profiler/scoped_profile.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h" #include "base/values.h" @@ -449,6 +450,10 @@ PreferenceAPI* PreferenceAPI::Get(content::BrowserContext* context) { } void PreferenceAPI::OnListenerAdded(const EventListenerInfo& details) { + // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed. + tracked_objects::ScopedProfile tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("PreferenceAPI::OnListenerAdded")); + preference_event_router_.reset(new PreferenceEventRouter(profile_)); EventRouter::Get(profile_)->UnregisterObserver(this); } |