Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / media_galleries / media_file_system_registry.cc

diff --git a/src/chrome/browser/media_galleries/media_file_system_registry.cc b/src/chrome/browser/media_galleries/media_file_system_registry.cc
index a53ed2b..ad06354 100644 (file)
--- a/src/chrome/browser/media_galleries/media_file_system_registry.cc
+++ b/src/chrome/browser/media_galleries/media_file_system_registry.cc
@@ -15,6 +15,7 @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"
 #include "chrome/browser/media_galleries/fileapi/mtp_device_map_service.h"
+#include "chrome/browser/media_galleries/gallery_watch_manager.h"
 #include "chrome/browser/media_galleries/imported_media_gallery_registry.h"
 #include "chrome/browser/media_galleries/media_file_system_context.h"
 #include "chrome/browser/media_galleries/media_galleries_dialog_controller.h"
@@ -280,6 +281,8 @@ class ExtensionGalleriesHost
   void GetMediaFileSystems(const MediaGalleryPrefIdSet& galleries,
                            const MediaGalleriesPrefInfoMap& galleries_info,
                            const MediaFileSystemsCallback& callback) {
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
+
     // Extract all the device ids so we can make sure they are attached.
     MediaStorageUtil::DeviceIdSet* device_ids =
         new MediaStorageUtil::DeviceIdSet;
@@ -492,7 +495,8 @@ void MediaFileSystemRegistry::GetMediaFileSystemsForExtension(
     const content::RenderViewHost* rvh,
     const extensions::Extension* extension,
     const MediaFileSystemsCallback& callback) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  // TODO(tommycli): Change to DCHECK after fixing http://crbug.com/374330.
+  CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   Profile* profile =
       Profile::FromBrowserContext(rvh->GetProcess()->GetBrowserContext());
@@ -567,6 +571,12 @@ MediaScanManager* MediaFileSystemRegistry::media_scan_manager() {
   return media_scan_manager_.get();
 }
 
+GalleryWatchManager* MediaFileSystemRegistry::gallery_watch_manager() {
+  if (!gallery_watch_manager_)
+    gallery_watch_manager_.reset(new GalleryWatchManager);
+  return gallery_watch_manager_.get();
+}
+
 void MediaFileSystemRegistry::OnRemovableStorageDetached(
     const StorageInfo& info) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);