| 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 // MediaFileSystemRegistry registers pictures directories and media devices as | 5 // MediaFileSystemRegistry registers pictures directories and media devices as |
| 6 // File API filesystems and keeps track of the path to filesystem ID mappings. | 6 // File API filesystems and keeps track of the path to filesystem ID mappings. |
| 7 | 7 |
| 8 #ifndef CHROME_BROWSER_MEDIA_GALLERY_MEDIA_FILE_SYSTEM_REGISTRY_H_ | 8 #ifndef CHROME_BROWSER_MEDIA_GALLERY_MEDIA_FILE_SYSTEM_REGISTRY_H_ |
| 9 #define CHROME_BROWSER_MEDIA_GALLERY_MEDIA_FILE_SYSTEM_REGISTRY_H_ | 9 #define CHROME_BROWSER_MEDIA_GALLERY_MEDIA_FILE_SYSTEM_REGISTRY_H_ |
| 10 | 10 |
| 11 #include <map> | 11 #include <map> |
| 12 #include <string> | 12 #include <string> |
| 13 #include <utility> | 13 #include <utility> |
| 14 #include <vector> | 14 #include <vector> |
| 15 | 15 |
| 16 #include "base/basictypes.h" | 16 #include "base/basictypes.h" |
| 17 #include "base/file_path.h" | 17 #include "base/file_path.h" |
| 18 #include "base/memory/ref_counted.h" | 18 #include "base/memory/ref_counted.h" |
| 19 #include "base/prefs/public/pref_change_registrar.h" | 19 #include "base/prefs/public/pref_change_registrar.h" |
| 20 #include "chrome/browser/media_gallery/media_galleries_preferences.h" | 20 #include "chrome/browser/media_gallery/media_galleries_preferences.h" |
| 21 #include "chrome/browser/media_gallery/transient_device_ids.h" | |
| 22 #include "chrome/browser/system_monitor/removable_storage_observer.h" | 21 #include "chrome/browser/system_monitor/removable_storage_observer.h" |
| 23 #include "webkit/fileapi/media/mtp_device_file_system_config.h" | 22 #include "webkit/fileapi/media/mtp_device_file_system_config.h" |
| 24 | 23 |
| 25 #if defined(SUPPORT_MTP_DEVICE_FILESYSTEM) | 24 #if defined(SUPPORT_MTP_DEVICE_FILESYSTEM) |
| 26 #include "chrome/browser/media_gallery/mtp_device_delegate_impl.h" | 25 #include "chrome/browser/media_gallery/mtp_device_delegate_impl.h" |
| 27 #endif | 26 #endif |
| 28 | 27 |
| 29 class Profile; | 28 class Profile; |
| 30 | 29 |
| 31 namespace content { | 30 namespace content { |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 | 145 |
| 147 PrefChangeRegistrarMap pref_change_registrar_map_; | 146 PrefChangeRegistrarMap pref_change_registrar_map_; |
| 148 | 147 |
| 149 #if defined(SUPPORT_MTP_DEVICE_FILESYSTEM) | 148 #if defined(SUPPORT_MTP_DEVICE_FILESYSTEM) |
| 150 // Only accessed on the UI thread. | 149 // Only accessed on the UI thread. |
| 151 MTPDeviceDelegateMap mtp_device_delegate_map_; | 150 MTPDeviceDelegateMap mtp_device_delegate_map_; |
| 152 #endif | 151 #endif |
| 153 | 152 |
| 154 scoped_ptr<MediaFileSystemContext> file_system_context_; | 153 scoped_ptr<MediaFileSystemContext> file_system_context_; |
| 155 | 154 |
| 156 TransientDeviceIds transient_device_ids_; | |
| 157 | |
| 158 DISALLOW_COPY_AND_ASSIGN(MediaFileSystemRegistry); | 155 DISALLOW_COPY_AND_ASSIGN(MediaFileSystemRegistry); |
| 159 }; | 156 }; |
| 160 | 157 |
| 161 } // namespace chrome | 158 } // namespace chrome |
| 162 | 159 |
| 163 #endif // CHROME_BROWSER_MEDIA_GALLERY_MEDIA_FILE_SYSTEM_REGISTRY_H_ | 160 #endif // CHROME_BROWSER_MEDIA_GALLERY_MEDIA_FILE_SYSTEM_REGISTRY_H_ |
| OLD | NEW |