OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/prefs/pref_notifier_impl.h" | 5 #include "chrome/browser/prefs/pref_notifier_impl.h" |
6 | 6 |
7 #include "base/stl_util-inl.h" | 7 #include "base/stl_util-inl.h" |
8 #include "chrome/browser/prefs/pref_service.h" | 8 #include "chrome/browser/prefs/pref_service.h" |
9 #include "content/common/notification_observer.h" | 9 #include "content/common/notification_observer.h" |
10 #include "content/common/notification_service.h" | 10 #include "content/common/notification_service.h" |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
67 } | 67 } |
68 | 68 |
69 NotificationObserverList* observer_list = observer_iterator->second; | 69 NotificationObserverList* observer_list = observer_iterator->second; |
70 observer_list->RemoveObserver(obs); | 70 observer_list->RemoveObserver(obs); |
71 } | 71 } |
72 | 72 |
73 void PrefNotifierImpl::OnPreferenceChanged(const std::string& path) { | 73 void PrefNotifierImpl::OnPreferenceChanged(const std::string& path) { |
74 FireObservers(path); | 74 FireObservers(path); |
75 } | 75 } |
76 | 76 |
77 void PrefNotifierImpl::OnInitializationCompleted() { | 77 void PrefNotifierImpl::OnInitializationCompleted(bool succeeded) { |
78 DCHECK(CalledOnValidThread()); | 78 DCHECK(CalledOnValidThread()); |
79 | 79 |
80 NotificationService::current()->Notify( | 80 NotificationService::current()->Notify( |
81 NotificationType::PREF_INITIALIZATION_COMPLETED, | 81 NotificationType::PREF_INITIALIZATION_COMPLETED, |
82 Source<PrefService>(pref_service_), | 82 Source<PrefService>(pref_service_), |
83 NotificationService::NoDetails()); | 83 Details<PrefService>(succeeded ? pref_service_ : NULL)); |
Mattias Nissler (ping if slow)
2011/05/04 23:33:08
That's a weird contract. Why not have an enum and
altimofeev
2011/05/05 12:59:28
I mistakenly thought that detail's pointer should
| |
84 } | 84 } |
85 | 85 |
86 void PrefNotifierImpl::FireObservers(const std::string& path) { | 86 void PrefNotifierImpl::FireObservers(const std::string& path) { |
87 DCHECK(CalledOnValidThread()); | 87 DCHECK(CalledOnValidThread()); |
88 | 88 |
89 // Only send notifications for registered preferences. | 89 // Only send notifications for registered preferences. |
90 if (!pref_service_->FindPreference(path.c_str())) | 90 if (!pref_service_->FindPreference(path.c_str())) |
91 return; | 91 return; |
92 | 92 |
93 const PrefObserverMap::iterator observer_iterator = | 93 const PrefObserverMap::iterator observer_iterator = |
94 pref_observers_.find(path); | 94 pref_observers_.find(path); |
95 if (observer_iterator == pref_observers_.end()) | 95 if (observer_iterator == pref_observers_.end()) |
96 return; | 96 return; |
97 | 97 |
98 NotificationObserverList::Iterator it(*(observer_iterator->second)); | 98 NotificationObserverList::Iterator it(*(observer_iterator->second)); |
99 NotificationObserver* observer; | 99 NotificationObserver* observer; |
100 while ((observer = it.GetNext()) != NULL) { | 100 while ((observer = it.GetNext()) != NULL) { |
101 observer->Observe(NotificationType::PREF_CHANGED, | 101 observer->Observe(NotificationType::PREF_CHANGED, |
102 Source<PrefService>(pref_service_), | 102 Source<PrefService>(pref_service_), |
103 Details<const std::string>(&path)); | 103 Details<const std::string>(&path)); |
104 } | 104 } |
105 } | 105 } |
OLD | NEW |