Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(365)

Side by Side Diff: chrome/browser/media_gallery/media_galleries_preferences.cc

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add to PrefRegistrySyncable and PrefServiceSyncable to let sync know of pre-registered prefs. Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/media_gallery/media_galleries_preferences.h" 5 #include "chrome/browser/media_gallery/media_galleries_preferences.h"
6 6
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "base/string_number_conversions.h" 9 #include "base/string_number_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "chrome/browser/extensions/extension_prefs.h" 11 #include "chrome/browser/extensions/extension_prefs.h"
12 #include "chrome/browser/extensions/extension_service.h" 12 #include "chrome/browser/extensions/extension_service.h"
13 #include "chrome/browser/extensions/extension_system.h" 13 #include "chrome/browser/extensions/extension_system.h"
14 #include "chrome/browser/media_gallery/media_file_system_registry.h" 14 #include "chrome/browser/media_gallery/media_file_system_registry.h"
15 #include "chrome/browser/prefs/pref_registry_syncable.h"
15 #include "chrome/browser/prefs/pref_service.h" 16 #include "chrome/browser/prefs/pref_service.h"
16 #include "chrome/browser/prefs/scoped_user_pref_update.h" 17 #include "chrome/browser/prefs/scoped_user_pref_update.h"
17 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/system_monitor/media_storage_util.h" 19 #include "chrome/browser/system_monitor/media_storage_util.h"
19 #include "chrome/common/chrome_paths.h" 20 #include "chrome/common/chrome_paths.h"
20 #include "chrome/common/extensions/extension.h" 21 #include "chrome/common/extensions/extension.h"
21 #include "chrome/common/extensions/permissions/api_permission.h" 22 #include "chrome/common/extensions/permissions/api_permission.h"
22 #include "chrome/common/extensions/permissions/media_galleries_permission.h" 23 #include "chrome/common/extensions/permissions/media_galleries_permission.h"
23 #include "chrome/common/pref_names.h" 24 #include "chrome/common/pref_names.h"
24 25
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 } 434 }
434 435
435 // static 436 // static
436 bool MediaGalleriesPreferences::APIHasBeenUsed(Profile* profile) { 437 bool MediaGalleriesPreferences::APIHasBeenUsed(Profile* profile) {
437 MediaGalleryPrefId current_id = 438 MediaGalleryPrefId current_id =
438 profile->GetPrefs()->GetUint64(prefs::kMediaGalleriesUniqueId); 439 profile->GetPrefs()->GetUint64(prefs::kMediaGalleriesUniqueId);
439 return current_id != kInvalidMediaGalleryPrefId + 1; 440 return current_id != kInvalidMediaGalleryPrefId + 1;
440 } 441 }
441 442
442 // static 443 // static
443 void MediaGalleriesPreferences::RegisterUserPrefs(PrefServiceSyncable* prefs) { 444 void MediaGalleriesPreferences::RegisterUserPrefs(
444 prefs->RegisterListPref(prefs::kMediaGalleriesRememberedGalleries, 445 PrefRegistrySyncable* registry) {
445 PrefServiceSyncable::UNSYNCABLE_PREF); 446 registry->RegisterListPref(prefs::kMediaGalleriesRememberedGalleries,
446 prefs->RegisterUint64Pref(prefs::kMediaGalleriesUniqueId, 447 PrefRegistrySyncable::UNSYNCABLE_PREF);
447 kInvalidMediaGalleryPrefId + 1, 448 registry->RegisterUint64Pref(prefs::kMediaGalleriesUniqueId,
448 PrefServiceSyncable::UNSYNCABLE_PREF); 449 kInvalidMediaGalleryPrefId + 1,
450 PrefRegistrySyncable::UNSYNCABLE_PREF);
449 } 451 }
450 452
451 extensions::ExtensionPrefs* 453 extensions::ExtensionPrefs*
452 MediaGalleriesPreferences::GetExtensionPrefs() const { 454 MediaGalleriesPreferences::GetExtensionPrefs() const {
453 ExtensionService* extension_service = 455 ExtensionService* extension_service =
454 extensions::ExtensionSystem::Get(profile_)->extension_service(); 456 extensions::ExtensionSystem::Get(profile_)->extension_service();
455 return extension_service->extension_prefs(); 457 return extension_service->extension_prefs();
456 } 458 }
457 459
458 } // namespace chrome 460 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698