Media galleries: configuration dialog controller and GTK impl.

chrome/browser/media_gallery/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_gallery/media_galleries_preferences.h"
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
@@ skipping 29 matching lines @@
   if (!dict->GetString(kMediaGalleriesPrefIdKey, &string_id) ||
       !base::StringToUint64(string_id, value)) {
     return false;
   }
 
   return true;
 }
 
 bool GetType(const DictionaryValue* dict, MediaGalleryPrefInfo::Type* type) {
   std::string string_type;
-  if (!dict->GetString(kMediaGalleriesPrefIdKey, &string_type))
+  if (!dict->GetString(kMediaGalleriesTypeKey, &string_type))

[Evan Stade, 2012/08/02 23:18:13]

ignore changes in this file.

     return false;
 
   if (string_type.compare(kMediaGalleriesTypeAutoDetectedValue) == 0) {
     *type = MediaGalleryPrefInfo::kAutoDetected;
     return true;
   } else if (string_type.compare(kMediaGalleriesTypeUserAddedValue) == 0) {
     *type = MediaGalleryPrefInfo::kUserAdded;
     return true;
   } else if (string_type.compare(kMediaGalleriesTypeBlackListedValue) == 0) {
     *type = MediaGalleryPrefInfo::kBlackListed;
@@ skipping 78 matching lines @@
 MediaGalleriesPreferences::MediaGalleriesPreferences(Profile* profile)
     : profile_(profile) {
   DCHECK(UserInteractionIsEnabled());
 
   // Populate the default galleries if this is a fresh profile.
   MediaGalleryPrefId current_id =
       profile_->GetPrefs()->GetUint64(prefs::kMediaGalleriesUniqueId);
   if (current_id == MediaGalleryPrefInfo::kInvalidPrefId + 1) {
     FilePath pictures_path;
     if (PathService::Get(chrome::DIR_USER_PICTURES, &pictures_path)) {
+
       std::string device_id = MediaFileSystemRegistry::GetInstance()->
           GetDeviceIdFromPath(pictures_path);
       string16 display_name = ComputeDisplayName(pictures_path);
       AddGallery(device_id, display_name, pictures_path, false /*user added*/);
     }
   }
   InitFromPrefs();
 }
 
 MediaGalleriesPreferences::~MediaGalleriesPreferences() {}
@@ skipping 70 matching lines @@
     }
     return existing_id;
   }
 
   PrefService* prefs = profile_->GetPrefs();
 
   MediaGalleryPrefInfo gallery_info;
   gallery_info.pref_id = prefs->GetUint64(prefs::kMediaGalleriesUniqueId);
   prefs->SetUint64(prefs::kMediaGalleriesUniqueId, gallery_info.pref_id + 1);
   gallery_info.display_name = display_name;
+  gallery_info.device_id = device_id;
   gallery_info.path = path;
   gallery_info.type = MediaGalleryPrefInfo::kAutoDetected;
   if (user_added)
     gallery_info.type = MediaGalleryPrefInfo::kUserAdded;
 
   ListPrefUpdate update(prefs, prefs::kMediaGalleriesRememberedGalleries);
   ListValue* list = update.Get();
   list->Append(CreateGalleryPrefInfoDictionary(gallery_info));
 
   known_galleries_[gallery_info.pref_id] = gallery_info;
@@ skipping 114 matching lines @@
 }
 
 extensions::ExtensionPrefs*
 MediaGalleriesPreferences::GetExtensionPrefs() const {
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   return extension_service->extension_prefs();
 }
 
 } // namespace chrome