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

Side by Side Diff: device/nfc/nfc_peer_chromeos.h

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 | « device/nfc/nfc_adapter_chromeos.h ('k') | device/nfc/nfc_tag_chromeos.h » ('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 #ifndef DEVICE_NFC_NFC_PEER_CHROMEOS_H_ 5 #ifndef DEVICE_NFC_NFC_PEER_CHROMEOS_H_
6 #define DEVICE_NFC_NFC_PEER_CHROMEOS_H_ 6 #define DEVICE_NFC_NFC_PEER_CHROMEOS_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 // Object path of the peer that we are currently tracking. 59 // Object path of the peer that we are currently tracking.
60 dbus::ObjectPath object_path_; 60 dbus::ObjectPath object_path_;
61 61
62 // A map containing the NDEF records that were received from the peer. 62 // A map containing the NDEF records that were received from the peer.
63 NdefRecordMap records_; 63 NdefRecordMap records_;
64 64
65 // Message instance that contains pointers to all created records. 65 // Message instance that contains pointers to all created records.
66 device::NfcNdefMessage message_; 66 device::NfcNdefMessage message_;
67 67
68 // List of observers interested in event notifications from us. 68 // List of observers interested in event notifications from us.
69 ObserverList<device::NfcPeer::Observer> observers_; 69 base::ObserverList<device::NfcPeer::Observer> observers_;
70 70
71 // Note: This should remain the last member so it'll be destroyed and 71 // Note: This should remain the last member so it'll be destroyed and
72 // invalidate its weak pointers before any other members are destroyed. 72 // invalidate its weak pointers before any other members are destroyed.
73 base::WeakPtrFactory<NfcPeerChromeOS> weak_ptr_factory_; 73 base::WeakPtrFactory<NfcPeerChromeOS> weak_ptr_factory_;
74 74
75 DISALLOW_COPY_AND_ASSIGN(NfcPeerChromeOS); 75 DISALLOW_COPY_AND_ASSIGN(NfcPeerChromeOS);
76 }; 76 };
77 77
78 } // namespace chromeos 78 } // namespace chromeos
79 79
80 #endif // DEVICE_NFC_NFC_PEER_CHROMEOS_H_ 80 #endif // DEVICE_NFC_NFC_PEER_CHROMEOS_H_
OLDNEW
« no previous file with comments | « device/nfc/nfc_adapter_chromeos.h ('k') | device/nfc/nfc_tag_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698