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

Side by Side Diff: chrome/browser/system_monitor/media_transfer_protocol_device_observer_chromeos.h

Issue 10918259: [Chrome OS]Implement MediaStorageUtil::GetDeviceInfoForPath function to support media gallery permi… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed review comments Created 8 years, 3 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 | Annotate | Revision Log
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 #ifndef CHROME_BROWSER_SYSTEM_MONITOR_MEDIA_TRANSFER_PROTOCOL_DEVICE_OBSERVER_CH ROMEOS_H_ 5 #ifndef CHROME_BROWSER_SYSTEM_MONITOR_MEDIA_TRANSFER_PROTOCOL_DEVICE_OBSERVER_CH ROMEOS_H_
6 #define CHROME_BROWSER_SYSTEM_MONITOR_MEDIA_TRANSFER_PROTOCOL_DEVICE_OBSERVER_CH ROMEOS_H_ 6 #define CHROME_BROWSER_SYSTEM_MONITOR_MEDIA_TRANSFER_PROTOCOL_DEVICE_OBSERVER_CH ROMEOS_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
11 #include "base/string16.h" 11 #include "base/string16.h"
12 #include "base/system_monitor/system_monitor.h"
12 #include "chrome/browser/chromeos/mtp/media_transfer_protocol_manager.h" 13 #include "chrome/browser/chromeos/mtp/media_transfer_protocol_manager.h"
13 14
15 class FilePath;
16
17 namespace chromeos {
18 namespace mtp {
19 class MediaTransferProtocolDeviceObserverCros;
20 } // namespace mtp
21 } // namespace chromeos
22
23 namespace chrome {
24
25 typedef class chromeos::mtp::MediaTransferProtocolDeviceObserverCros
26 MediaTransferProtocolDeviceObserver;
27
28 } // namespace chrome
29
14 namespace chromeos { 30 namespace chromeos {
15 namespace mtp { 31 namespace mtp {
16 32
17 // Gets the mtp device information given a |storage_name|. On success, 33 // Gets the mtp device information given a |storage_name|. On success,
18 // fills in |id|, |name| and |location|. 34 // fills in |id|, |name| and |location|.
19 typedef void (*GetStorageInfoFunc)(const std::string& storage_name, 35 typedef void (*GetStorageInfoFunc)(const std::string& storage_name,
20 std::string* id, 36 std::string* id,
21 string16* name, 37 string16* name,
22 std::string* location); 38 std::string* location);
23 39
24 // Helper class to send MTP storage attachment and detachment events to 40 // Helper class to send MTP storage attachment and detachment events to
25 // SystemMonitor. 41 // SystemMonitor.
26 class MediaTransferProtocolDeviceObserverCros 42 class MediaTransferProtocolDeviceObserverCros
27 : public MediaTransferProtocolManager::Observer { 43 : public MediaTransferProtocolManager::Observer {
28 public: 44 public:
45 // Should only be called by browser start up code. Use GetInstance() instead.
29 MediaTransferProtocolDeviceObserverCros(); 46 MediaTransferProtocolDeviceObserverCros();
30 virtual ~MediaTransferProtocolDeviceObserverCros(); 47 virtual ~MediaTransferProtocolDeviceObserverCros();
31 48
49 static MediaTransferProtocolDeviceObserverCros* GetInstance();
50
51 // Finds the storage that contains |path| and populates |storage_info|.
52 // Returns false if unable to find the storage.
53 bool GetStorageInfoForPath(
54 const FilePath& path,
55 base::SystemMonitor::RemovableStorageInfo* storage_info) const;
56
32 protected: 57 protected:
33 // Only used in unit tests. 58 // Only used in unit tests.
34 explicit MediaTransferProtocolDeviceObserverCros( 59 explicit MediaTransferProtocolDeviceObserverCros(
35 GetStorageInfoFunc get_storage_info_func); 60 GetStorageInfoFunc get_storage_info_func);
36 61
37 // MediaTransferProtocolManager::Observer implementation. 62 // MediaTransferProtocolManager::Observer implementation.
38 // Exposed for unit tests. 63 // Exposed for unit tests.
39 virtual void StorageChanged(bool is_attached, 64 virtual void StorageChanged(bool is_attached,
40 const std::string& storage_name) OVERRIDE; 65 const std::string& storage_name) OVERRIDE;
41 66
42 private: 67 private:
43 // Mapping of storage name and device id. 68 // Mapping of storage location and mtp storage info object.
44 typedef std::map<std::string, std::string> StorageNameToIdMap; 69 typedef std::map<std::string,
70 base::SystemMonitor::RemovableStorageInfo>
71 StorageLocationToInfoMap;
45 72
46 // Enumerate existing mtp storage devices. 73 // Enumerate existing mtp storage devices.
47 void EnumerateStorages(); 74 void EnumerateStorages();
48 75
49 // Map of all attached mtp devices. 76 // Map of all attached mtp devices.
50 StorageNameToIdMap storage_map_; 77 StorageLocationToInfoMap storage_map_;
51 78
52 // Function handler to get storage information. This is useful to set a mock 79 // Function handler to get storage information. This is useful to set a mock
53 // handler for unit testing. 80 // handler for unit testing.
54 GetStorageInfoFunc get_storage_info_func_; 81 GetStorageInfoFunc get_storage_info_func_;
55 82
56 DISALLOW_COPY_AND_ASSIGN(MediaTransferProtocolDeviceObserverCros); 83 DISALLOW_COPY_AND_ASSIGN(MediaTransferProtocolDeviceObserverCros);
57 }; 84 };
58 85
59 } // namespace mtp 86 } // namespace mtp
60 } // namespace chromeos 87 } // namespace chromeos
61 88
62 #endif // CHROME_BROWSER_SYSTEM_MONITOR_MEDIA_TRANSFER_PROTOCOL_DEVICE_OBSERVER _CHROMEOS_H_ 89 #endif // CHROME_BROWSER_SYSTEM_MONITOR_MEDIA_TRANSFER_PROTOCOL_DEVICE_OBSERVER _CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698