Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: base/prefs/pref_notifier_impl.cc

Issue 753603002: Change preference APIs to take std::string instead of const char*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed all calls to c_str() in prefs. Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « base/prefs/pref_notifier_impl.h ('k') | base/prefs/pref_notifier_impl_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/prefs/pref_notifier_impl.h" 5 #include "base/prefs/pref_notifier_impl.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 10
(...skipping 20 matching lines...) Expand all
31 // Same for initialization observers. 31 // Same for initialization observers.
32 if (!init_observers_.empty()) 32 if (!init_observers_.empty())
33 LOG(WARNING) << "Init observer found at shutdown."; 33 LOG(WARNING) << "Init observer found at shutdown.";
34 34
35 STLDeleteContainerPairSecondPointers(pref_observers_.begin(), 35 STLDeleteContainerPairSecondPointers(pref_observers_.begin(),
36 pref_observers_.end()); 36 pref_observers_.end());
37 pref_observers_.clear(); 37 pref_observers_.clear();
38 init_observers_.clear(); 38 init_observers_.clear();
39 } 39 }
40 40
41 void PrefNotifierImpl::AddPrefObserver(const char* path, 41 void PrefNotifierImpl::AddPrefObserver(const std::string& path,
42 PrefObserver* obs) { 42 PrefObserver* obs) {
43 // Get the pref observer list associated with the path. 43 // Get the pref observer list associated with the path.
44 PrefObserverList* observer_list = NULL; 44 PrefObserverList* observer_list = NULL;
45 const PrefObserverMap::iterator observer_iterator = 45 const PrefObserverMap::iterator observer_iterator =
46 pref_observers_.find(path); 46 pref_observers_.find(path);
47 if (observer_iterator == pref_observers_.end()) { 47 if (observer_iterator == pref_observers_.end()) {
48 observer_list = new PrefObserverList; 48 observer_list = new PrefObserverList;
49 pref_observers_[path] = observer_list; 49 pref_observers_[path] = observer_list;
50 } else { 50 } else {
51 observer_list = observer_iterator->second; 51 observer_list = observer_iterator->second;
52 } 52 }
53 53
54 // Add the pref observer. ObserverList will DCHECK if it already is 54 // Add the pref observer. ObserverList will DCHECK if it already is
55 // in the list. 55 // in the list.
56 observer_list->AddObserver(obs); 56 observer_list->AddObserver(obs);
57 } 57 }
58 58
59 void PrefNotifierImpl::RemovePrefObserver(const char* path, 59 void PrefNotifierImpl::RemovePrefObserver(const std::string& path,
60 PrefObserver* obs) { 60 PrefObserver* obs) {
61 DCHECK(thread_checker_.CalledOnValidThread()); 61 DCHECK(thread_checker_.CalledOnValidThread());
62 62
63 const PrefObserverMap::iterator observer_iterator = 63 const PrefObserverMap::iterator observer_iterator =
64 pref_observers_.find(path); 64 pref_observers_.find(path);
65 if (observer_iterator == pref_observers_.end()) { 65 if (observer_iterator == pref_observers_.end()) {
66 return; 66 return;
67 } 67 }
68 68
69 PrefObserverList* observer_list = observer_iterator->second; 69 PrefObserverList* observer_list = observer_iterator->second;
(...skipping 21 matching lines...) Expand all
91 it != observers.end(); 91 it != observers.end();
92 ++it) { 92 ++it) {
93 it->Run(succeeded); 93 it->Run(succeeded);
94 } 94 }
95 } 95 }
96 96
97 void PrefNotifierImpl::FireObservers(const std::string& path) { 97 void PrefNotifierImpl::FireObservers(const std::string& path) {
98 DCHECK(thread_checker_.CalledOnValidThread()); 98 DCHECK(thread_checker_.CalledOnValidThread());
99 99
100 // Only send notifications for registered preferences. 100 // Only send notifications for registered preferences.
101 if (!pref_service_->FindPreference(path.c_str())) 101 if (!pref_service_->FindPreference(path))
102 return; 102 return;
103 103
104 const PrefObserverMap::iterator observer_iterator = 104 const PrefObserverMap::iterator observer_iterator =
105 pref_observers_.find(path); 105 pref_observers_.find(path);
106 if (observer_iterator == pref_observers_.end()) 106 if (observer_iterator == pref_observers_.end())
107 return; 107 return;
108 108
109 FOR_EACH_OBSERVER(PrefObserver, 109 FOR_EACH_OBSERVER(PrefObserver,
110 *(observer_iterator->second), 110 *(observer_iterator->second),
111 OnPreferenceChanged(pref_service_, path)); 111 OnPreferenceChanged(pref_service_, path));
112 } 112 }
113 113
114 void PrefNotifierImpl::SetPrefService(PrefService* pref_service) { 114 void PrefNotifierImpl::SetPrefService(PrefService* pref_service) {
115 DCHECK(pref_service_ == NULL); 115 DCHECK(pref_service_ == NULL);
116 pref_service_ = pref_service; 116 pref_service_ = pref_service;
117 } 117 }
OLDNEW
« no previous file with comments | « base/prefs/pref_notifier_impl.h ('k') | base/prefs/pref_notifier_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698