OLD | NEW |
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 <map> | 7 #include <map> |
8 #include <queue> | 8 #include <queue> |
9 #include <set> | 9 #include <set> |
10 #include <utility> | 10 #include <utility> |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 mtpd_owner_changed_callback_); | 62 mtpd_owner_changed_callback_); |
63 } | 63 } |
64 | 64 |
65 virtual ~MediaTransferProtocolManagerImpl() { | 65 virtual ~MediaTransferProtocolManagerImpl() { |
66 DCHECK(g_media_transfer_protocol_manager); | 66 DCHECK(g_media_transfer_protocol_manager); |
67 g_media_transfer_protocol_manager = NULL; | 67 g_media_transfer_protocol_manager = NULL; |
68 GetBus()->UnlistenForServiceOwnerChange(mtpd::kMtpdServiceName, | 68 GetBus()->UnlistenForServiceOwnerChange(mtpd::kMtpdServiceName, |
69 mtpd_owner_changed_callback_); | 69 mtpd_owner_changed_callback_); |
70 | 70 |
71 #if !defined(OS_CHROMEOS) | 71 #if !defined(OS_CHROMEOS) |
72 session_bus_->PostTaskToDBusThread( | 72 session_bus_->GetDBusTaskRunner()->PostTask( |
73 FROM_HERE, base::Bind(&dbus::Bus::ShutdownAndBlock, session_bus_)); | 73 FROM_HERE, base::Bind(&dbus::Bus::ShutdownAndBlock, session_bus_)); |
74 #endif | 74 #endif |
75 | 75 |
76 VLOG(1) << "MediaTransferProtocolManager Shutdown completed"; | 76 VLOG(1) << "MediaTransferProtocolManager Shutdown completed"; |
77 } | 77 } |
78 | 78 |
79 // MediaTransferProtocolManager override. | 79 // MediaTransferProtocolManager override. |
80 virtual void AddObserver(Observer* observer) OVERRIDE { | 80 virtual void AddObserver(Observer* observer) OVERRIDE { |
81 observers_.AddObserver(observer); | 81 observers_.AddObserver(observer); |
82 } | 82 } |
83 | 83 |
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
487 DCHECK(!g_media_transfer_protocol_manager); | 487 DCHECK(!g_media_transfer_protocol_manager); |
488 | 488 |
489 g_media_transfer_protocol_manager = | 489 g_media_transfer_protocol_manager = |
490 new MediaTransferProtocolManagerImpl(task_runner); | 490 new MediaTransferProtocolManagerImpl(task_runner); |
491 VLOG(1) << "MediaTransferProtocolManager initialized"; | 491 VLOG(1) << "MediaTransferProtocolManager initialized"; |
492 | 492 |
493 return g_media_transfer_protocol_manager; | 493 return g_media_transfer_protocol_manager; |
494 } | 494 } |
495 | 495 |
496 } // namespace device | 496 } // namespace device |
OLD | NEW |