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

Side by Side Diff: device/media_transfer_protocol/media_transfer_protocol_manager.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 | « device/hid/input_service_linux.h ('k') | device/nfc/nfc_adapter_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 (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 "device/media_transfer_protocol/media_transfer_protocol_manager.h" 5 #include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 #include <queue> 9 #include <queue>
10 #include <set> 10 #include <set>
(...skipping 653 matching lines...) Expand 10 before | Expand all | Expand 10 after
664 664
665 // Mtpd DBus client. 665 // Mtpd DBus client.
666 scoped_ptr<MediaTransferProtocolDaemonClient> mtp_client_; 666 scoped_ptr<MediaTransferProtocolDaemonClient> mtp_client_;
667 667
668 #if !defined(OS_CHROMEOS) 668 #if !defined(OS_CHROMEOS)
669 // And a D-Bus session for talking to mtpd. 669 // And a D-Bus session for talking to mtpd.
670 scoped_refptr<dbus::Bus> session_bus_; 670 scoped_refptr<dbus::Bus> session_bus_;
671 #endif 671 #endif
672 672
673 // Device attachment / detachment observers. 673 // Device attachment / detachment observers.
674 ObserverList<Observer> observers_; 674 base::ObserverList<Observer> observers_;
675 675
676 // Map to keep track of attached storages by name. 676 // Map to keep track of attached storages by name.
677 StorageInfoMap storage_info_map_; 677 StorageInfoMap storage_info_map_;
678 678
679 // Set of open storage handles. 679 // Set of open storage handles.
680 std::set<std::string> handles_; 680 std::set<std::string> handles_;
681 681
682 dbus::Bus::GetServiceOwnerCallback mtpd_owner_changed_callback_; 682 dbus::Bus::GetServiceOwnerCallback mtpd_owner_changed_callback_;
683 683
684 std::string current_mtpd_owner_; 684 std::string current_mtpd_owner_;
(...skipping 25 matching lines...) Expand all
710 DCHECK(!g_media_transfer_protocol_manager); 710 DCHECK(!g_media_transfer_protocol_manager);
711 711
712 g_media_transfer_protocol_manager = 712 g_media_transfer_protocol_manager =
713 new MediaTransferProtocolManagerImpl(task_runner); 713 new MediaTransferProtocolManagerImpl(task_runner);
714 VLOG(1) << "MediaTransferProtocolManager initialized"; 714 VLOG(1) << "MediaTransferProtocolManager initialized";
715 715
716 return g_media_transfer_protocol_manager; 716 return g_media_transfer_protocol_manager;
717 } 717 }
718 718
719 } // namespace device 719 } // namespace device
OLDNEW
« no previous file with comments | « device/hid/input_service_linux.h ('k') | device/nfc/nfc_adapter_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698