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

Side by Side Diff: chromeos/dbus/nfc_manager_client.cc

Issue 1162943002: Replace more ObserverList with base::ObserverList. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@observer
Patch Set: Created 5 years, 6 months 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 | « chromeos/dbus/nfc_device_client.cc ('k') | chromeos/dbus/nfc_record_client.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chromeos/dbus/nfc_manager_client.h" 5 #include "chromeos/dbus/nfc_manager_client.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/memory/weak_ptr.h" 8 #include "base/memory/weak_ptr.h"
9 #include "base/observer_list.h" 9 #include "base/observer_list.h"
10 #include "dbus/bus.h" 10 #include "dbus/bus.h"
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 LOG_IF(WARNING, !success) << "Failed to connect to AdapterRemoved signal."; 137 LOG_IF(WARNING, !success) << "Failed to connect to AdapterRemoved signal.";
138 } 138 }
139 139
140 // D-Bus proxy for neard Manager interface. 140 // D-Bus proxy for neard Manager interface.
141 dbus::ObjectProxy* object_proxy_; 141 dbus::ObjectProxy* object_proxy_;
142 142
143 // Properties for neard Manager interface. 143 // Properties for neard Manager interface.
144 scoped_ptr<Properties> properties_; 144 scoped_ptr<Properties> properties_;
145 145
146 // List of observers interested in event notifications. 146 // List of observers interested in event notifications.
147 ObserverList<NfcManagerClient::Observer> observers_; 147 base::ObserverList<NfcManagerClient::Observer> observers_;
148 148
149 // Weak pointer factory for generating 'this' pointers that might live longer 149 // Weak pointer factory for generating 'this' pointers that might live longer
150 // than we do. 150 // than we do.
151 // Note: This should remain the last member so it'll be destroyed and 151 // Note: This should remain the last member so it'll be destroyed and
152 // invalidate its weak pointers before any other members are destroyed. 152 // invalidate its weak pointers before any other members are destroyed.
153 base::WeakPtrFactory<NfcManagerClientImpl> weak_ptr_factory_; 153 base::WeakPtrFactory<NfcManagerClientImpl> weak_ptr_factory_;
154 154
155 DISALLOW_COPY_AND_ASSIGN(NfcManagerClientImpl); 155 DISALLOW_COPY_AND_ASSIGN(NfcManagerClientImpl);
156 }; 156 };
157 157
158 NfcManagerClient::NfcManagerClient() { 158 NfcManagerClient::NfcManagerClient() {
159 } 159 }
160 160
161 NfcManagerClient::~NfcManagerClient() { 161 NfcManagerClient::~NfcManagerClient() {
162 } 162 }
163 163
164 // static 164 // static
165 NfcManagerClient* NfcManagerClient::Create() { 165 NfcManagerClient* NfcManagerClient::Create() {
166 return new NfcManagerClientImpl(); 166 return new NfcManagerClientImpl();
167 } 167 }
168 168
169 } // namespace chromeos 169 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/dbus/nfc_device_client.cc ('k') | chromeos/dbus/nfc_record_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698