Connect MediaFileSystemRegistry with MediaGalleriesPreferences

chrome/browser/intents/device_attached_intent_source.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/intents/device_attached_intent_source.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/file_path.h"
@@ skipping 84 matching lines @@
     const FilePath::StringType& location) {
   if (!browser_->window()->IsActive())
     return;
 
   // TODO(kmadhusu): Dispatch intents on incognito window.
   if (browser_->profile()->IsOffTheRecord())
     return;
 
   // Only handle mass storage for now.
   // TODO(kmadhusu): Handle all device types. http://crbug.com/140353.
-  MediaStorageUtil::Type type;
-  MediaStorageUtil::CrackDeviceId(id, &type, NULL);
-  if (type == MediaStorageUtil::MTP_OR_PTP)
+  if (!MediaStorageUtil::IsMassStorageDevice(id))
     return;
   DCHECK(MediaStorageUtil::IsRemovableDevice(id));

[Lei Zhang, 2012/09/04 23:38:51]

I think you need to remove this?

[vandebo (ex-Chrome), 2012/09/05 00:58:12]

Why? Device attach intent should only trigger for removable devices.

 
   // Sanity checks for |device_path|.
   const FilePath device_path(location);
   if (!device_path.IsAbsolute() || device_path.ReferencesParent())
     return;
 
   SystemMonitor::RemovableStorageInfo device_info(id, name, location);
   scoped_refptr<DispatchIntentTaskHelper> task = new DispatchIntentTaskHelper(
       AsWeakPtr(), device_info);
   WebIntentsRegistryFactory::GetForProfile(browser_->profile())->
@@ skipping 29 matching lines @@
 void DeviceAttachedIntentSource::OnRemovableStorageDetached(
     const std::string& id) {
   DeviceIdToInfoMap::iterator it = device_id_map_.find(id);
   if (it == device_id_map_.end())
     return;
 
   FilePath path(it->second.location);
   fileapi::IsolatedContext::GetInstance()->RevokeFileSystemByPath(path);
   device_id_map_.erase(it);
 }