iTunes file util and data provider for media galleries

chrome/browser/media_galleries/media_galleries_preferences.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/media_galleries/media_galleries_preferences.h"
 
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "base/string16.h"
@@ skipping 198 matching lines @@
   return base_path.empty() ? base_path : base_path.Append(path);
 }
 
 MediaGalleriesPreferences::GalleryChangeObserver::~GalleryChangeObserver() {}
 
 MediaGalleriesPreferences::MediaGalleriesPreferences(Profile* profile)
     : weak_factory_(this),
       profile_(profile) {
   AddDefaultGalleriesIfFreshProfile();
 
-  // TODO(vandebo) Turn this back on when the iTunes code is ready.
-  // Temporarily turned off because it adds an extra user-visible entry to the
-  // preferences that does not quite work.
-#if 0
   // Look for optional default galleries every time.
   itunes::ITunesFinder::FindITunesLibrary(
       base::Bind(&MediaGalleriesPreferences::OnITunesDeviceID,
                  weak_factory_.GetWeakPtr()));
-#endif
 
   // TODO(tommycli): Turn on when Picasa code is ready.
 #if 0
   picasa::PicasaFinder::FindPicasaDatabaseOnUIThread(
       base::Bind(&MediaGalleriesPreferences::OnPicasaDeviceID,
                  weak_factory_.GetWeakPtr()));
 #endif
 
   InitFromPrefs(false /*no notification*/);
 
@@ skipping 26 matching lines @@
     if (MediaStorageUtil::GetDeviceInfoFromPath(path, &info, &relative_path)) {
       // TODO(gbillock): Add in the volume metadata here when available.
       AddGalleryWithName(info.device_id(), info.name(), relative_path,
                          false /*user added*/);
     }
   }
 }
 
 void MediaGalleriesPreferences::OnITunesDeviceID(const std::string& device_id) {
   DCHECK(!device_id.empty());
+  // TODO(vandebo): Amend any existing iTunes gallery instead of adding anew.

[Lei Zhang, 2013/06/06 03:48:47]

nit: Add more context. This is for the corner case of the user changing their
iTunes folder, right?

[vandebo (ex-Chrome), 2013/06/06 19:49:18]

Done.

   AddGalleryWithName(device_id, ASCIIToUTF16(kITunesGalleryName),
                      base::FilePath(), false /*not user added*/);
 }
 
 void MediaGalleriesPreferences::OnPicasaDeviceID(const std::string& device_id) {
   // TODO(tommycli): Implement support for location moves.
   DCHECK(!device_id.empty());
   AddGalleryWithName(device_id, ASCIIToUTF16(kPicasaGalleryName),
                      base::FilePath(), false /*not user added*/);
 }
@@ skipping 415 matching lines @@
 }
 
 extensions::ExtensionPrefs*
 MediaGalleriesPreferences::GetExtensionPrefs() const {
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   return extension_service->extension_prefs();
 }
 
 }  // namespace chrome