| 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 "chrome/browser/media_galleries/media_file_system_registry.h" | 5 #include "chrome/browser/media_galleries/media_file_system_registry.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 #include "content/public/browser/browser_thread.h" | 31 #include "content/public/browser/browser_thread.h" |
| 32 #include "content/public/browser/navigation_details.h" | 32 #include "content/public/browser/navigation_details.h" |
| 33 #include "content/public/browser/render_process_host.h" | 33 #include "content/public/browser/render_process_host.h" |
| 34 #include "content/public/browser/render_process_host_observer.h" | 34 #include "content/public/browser/render_process_host_observer.h" |
| 35 #include "content/public/browser/render_view_host.h" | 35 #include "content/public/browser/render_view_host.h" |
| 36 #include "content/public/browser/web_contents.h" | 36 #include "content/public/browser/web_contents.h" |
| 37 #include "content/public/browser/web_contents_observer.h" | 37 #include "content/public/browser/web_contents_observer.h" |
| 38 #include "extensions/browser/extension_system.h" | 38 #include "extensions/browser/extension_system.h" |
| 39 #include "extensions/common/extension.h" | 39 #include "extensions/common/extension.h" |
| 40 #include "extensions/common/extension_set.h" | 40 #include "extensions/common/extension_set.h" |
| 41 #include "storage/browser/fileapi/external_mount_points.h" |
| 41 #include "storage/common/fileapi/file_system_mount_option.h" | 42 #include "storage/common/fileapi/file_system_mount_option.h" |
| 42 #include "storage/common/fileapi/file_system_types.h" | 43 #include "storage/common/fileapi/file_system_types.h" |
| 43 #include "webkit/browser/fileapi/external_mount_points.h" | |
| 44 | 44 |
| 45 using content::BrowserThread; | 45 using content::BrowserThread; |
| 46 using content::NavigationController; | 46 using content::NavigationController; |
| 47 using content::RenderProcessHost; | 47 using content::RenderProcessHost; |
| 48 using content::WebContents; | 48 using content::WebContents; |
| 49 using storage::ExternalMountPoints; | 49 using storage::ExternalMountPoints; |
| 50 using storage_monitor::MediaStorageUtil; | 50 using storage_monitor::MediaStorageUtil; |
| 51 using storage_monitor::StorageInfo; | 51 using storage_monitor::StorageInfo; |
| 52 using storage_monitor::StorageMonitor; | 52 using storage_monitor::StorageMonitor; |
| 53 | 53 |
| (...skipping 786 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 840 DCHECK_EQ(1U, erase_count); | 840 DCHECK_EQ(1U, erase_count); |
| 841 if (extension_hosts->second.empty()) { | 841 if (extension_hosts->second.empty()) { |
| 842 // When a profile has no ExtensionGalleriesHosts left, remove the | 842 // When a profile has no ExtensionGalleriesHosts left, remove the |
| 843 // matching gallery-change-watcher since it is no longer needed. Leave the | 843 // matching gallery-change-watcher since it is no longer needed. Leave the |
| 844 // |extension_hosts| entry alone, since it indicates the profile has been | 844 // |extension_hosts| entry alone, since it indicates the profile has been |
| 845 // previously used. | 845 // previously used. |
| 846 MediaGalleriesPreferences* preferences = GetPreferences(profile); | 846 MediaGalleriesPreferences* preferences = GetPreferences(profile); |
| 847 preferences->RemoveGalleryChangeObserver(this); | 847 preferences->RemoveGalleryChangeObserver(this); |
| 848 } | 848 } |
| 849 } | 849 } |
| OLD | NEW |