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 // chromeos::MediaDeviceNotifications implementation. | 5 // chromeos::MediaDeviceNotifications implementation. |
6 | 6 |
7 #include "chrome/browser/media_gallery/media_device_notifications_chromeos.h" | 7 #include "chrome/browser/media_gallery/media_device_notifications_chromeos.h" |
8 | 8 |
9 #include "base/file_path.h" | 9 #include "base/file_path.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/metrics/histogram.h" | 11 #include "base/metrics/histogram.h" |
12 #include "base/stl_util.h" | 12 #include "base/stl_util.h" |
13 #include "base/string_number_conversions.h" | 13 #include "base/string_number_conversions.h" |
14 #include "base/utf_string_conversions.h" | 14 #include "base/utf_string_conversions.h" |
15 #include "chrome/browser/media_gallery/media_device_notifications_utils.h" | 15 #include "chrome/browser/media_gallery/media_device_notifications_utils.h" |
16 #include "content/public/browser/browser_thread.h" | 16 #include "content/public/browser/browser_thread.h" |
17 | 17 |
18 namespace chromeos { | 18 namespace chromeos { |
19 | 19 |
20 namespace { | 20 namespace { |
21 | 21 |
22 std::string GetDeviceUuid(const std::string& source_path) { | 22 std::string GetDeviceUuid(const std::string& source_path) { |
23 // Get the media device uuid if exists. | 23 // Get the media device uuid if exists. |
24 const disks::DiskMountManager::DiskMap& disks = | 24 const disks::DiskMountManager::Disk* disk = |
25 disks::DiskMountManager::GetInstance()->disks(); | 25 disks::DiskMountManager::GetInstance()->FindDiskBySourcePath(source_path); |
26 disks::DiskMountManager::DiskMap::const_iterator it = disks.find(source_path); | 26 return disk == NULL ? std::string() : disk->fs_uuid(); |
Ben Chan
2012/08/03 15:04:55
return disk ? disk->fs_uuid() : std::string();
kmadhusu
2012/08/03 18:13:52
Fixed.
| |
27 return it == disks.end() ? std::string() : it->second->fs_uuid(); | |
28 } | 27 } |
29 | 28 |
30 } // namespace | 29 } // namespace |
31 | 30 |
32 using content::BrowserThread; | 31 using content::BrowserThread; |
33 | 32 |
34 MediaDeviceNotifications::MediaDeviceNotifications() { | 33 MediaDeviceNotifications::MediaDeviceNotifications() { |
35 DCHECK(disks::DiskMountManager::GetInstance()); | 34 DCHECK(disks::DiskMountManager::GetInstance()); |
36 disks::DiskMountManager::GetInstance()->AddObserver(this); | 35 disks::DiskMountManager::GetInstance()->AddObserver(this); |
37 } | 36 } |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
125 | 124 |
126 mount_map_.insert(std::make_pair(mount_info.mount_path, device_id_str)); | 125 mount_map_.insert(std::make_pair(mount_info.mount_path, device_id_str)); |
127 base::SystemMonitor::Get()->ProcessMediaDeviceAttached( | 126 base::SystemMonitor::Get()->ProcessMediaDeviceAttached( |
128 device_id_str, | 127 device_id_str, |
129 UTF8ToUTF16(FilePath(mount_info.source_path).BaseName().value()), | 128 UTF8ToUTF16(FilePath(mount_info.source_path).BaseName().value()), |
130 base::SystemMonitor::TYPE_PATH, | 129 base::SystemMonitor::TYPE_PATH, |
131 mount_info.mount_path); | 130 mount_info.mount_path); |
132 } | 131 } |
133 | 132 |
134 } // namespace chrome | 133 } // namespace chrome |
OLD | NEW |