media galleries config dialog on views

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 143 matching lines @@
 
 }  // namespace
 
 MediaGalleryPrefInfo::MediaGalleryPrefInfo()
     : pref_id(kInvalidMediaGalleryPrefId) {
 }
 MediaGalleryPrefInfo::~MediaGalleryPrefInfo() {}
 
 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 == kInvalidMediaGalleryPrefId + 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*/);
@@ skipping 203 matching lines @@
 }
 
 // static
 string16 MediaGalleriesPreferences::ComputeDisplayName(const FilePath& path) {
   // Assumes that path is a directory and not a file.
   return path.BaseName().LossyDisplayName();
 }
 
 // static
 void MediaGalleriesPreferences::RegisterUserPrefs(PrefService* prefs) {
-  if (!UserInteractionIsEnabled())

[vandebo (ex-Chrome), 2012/08/10 00:35:28]

Please remove this from media_galleries_pereferences_unittests.cc too

[Evan Stade, 2012/08/10 21:58:13]

Done.

-    return;
-
   prefs->RegisterListPref(prefs::kMediaGalleriesRememberedGalleries,
                           PrefService::UNSYNCABLE_PREF);
   prefs->RegisterUint64Pref(prefs::kMediaGalleriesUniqueId,
                             kInvalidMediaGalleryPrefId + 1,
                             PrefService::UNSYNCABLE_PREF);
 }
 
 extensions::ExtensionPrefs*
 MediaGalleriesPreferences::GetExtensionPrefs() const {
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   return extension_service->extension_prefs();
 }
 
 } // namespace chrome