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

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: Merge to head again; base::File changes conflicted. 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/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/extensions/api/media_galleries_private/gallery_watch_st ate_tracker.h" 12 #include "chrome/browser/extensions/api/media_galleries_private/gallery_watch_st ate_tracker.h"
13 #include "chrome/browser/extensions/extension_prefs.h" 13 #include "chrome/browser/extensions/extension_prefs.h"
14 #include "chrome/browser/extensions/extension_service.h" 14 #include "chrome/browser/extensions/extension_service.h"
15 #include "chrome/browser/extensions/extension_system.h" 15 #include "chrome/browser/extensions/extension_system.h"
16 #include "chrome/browser/media_gallery/media_file_system_registry.h" 16 #include "chrome/browser/media_gallery/media_file_system_registry.h"
17 #include "chrome/browser/prefs/pref_registry_syncable.h"
17 #include "chrome/browser/prefs/pref_service.h" 18 #include "chrome/browser/prefs/pref_service.h"
18 #include "chrome/browser/prefs/scoped_user_pref_update.h" 19 #include "chrome/browser/prefs/scoped_user_pref_update.h"
19 #include "chrome/browser/profiles/profile.h" 20 #include "chrome/browser/profiles/profile.h"
20 #include "chrome/browser/system_monitor/media_storage_util.h" 21 #include "chrome/browser/system_monitor/media_storage_util.h"
21 #include "chrome/common/chrome_paths.h" 22 #include "chrome/common/chrome_paths.h"
22 #include "chrome/common/extensions/extension.h" 23 #include "chrome/common/extensions/extension.h"
23 #include "chrome/common/extensions/permissions/api_permission.h" 24 #include "chrome/common/extensions/permissions/api_permission.h"
24 #include "chrome/common/extensions/permissions/media_galleries_permission.h" 25 #include "chrome/common/extensions/permissions/media_galleries_permission.h"
25 #include "chrome/common/pref_names.h" 26 #include "chrome/common/pref_names.h"
26 27
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 } 470 }
470 471
471 // static 472 // static
472 bool MediaGalleriesPreferences::APIHasBeenUsed(Profile* profile) { 473 bool MediaGalleriesPreferences::APIHasBeenUsed(Profile* profile) {
473 MediaGalleryPrefId current_id = 474 MediaGalleryPrefId current_id =
474 profile->GetPrefs()->GetUint64(prefs::kMediaGalleriesUniqueId); 475 profile->GetPrefs()->GetUint64(prefs::kMediaGalleriesUniqueId);
475 return current_id != kInvalidMediaGalleryPrefId + 1; 476 return current_id != kInvalidMediaGalleryPrefId + 1;
476 } 477 }
477 478
478 // static 479 // static
479 void MediaGalleriesPreferences::RegisterUserPrefs(PrefServiceSyncable* prefs) { 480 void MediaGalleriesPreferences::RegisterUserPrefs(
480 prefs->RegisterListPref(prefs::kMediaGalleriesRememberedGalleries, 481 PrefRegistrySyncable* registry) {
481 PrefServiceSyncable::UNSYNCABLE_PREF); 482 registry->RegisterListPref(prefs::kMediaGalleriesRememberedGalleries,
482 prefs->RegisterUint64Pref(prefs::kMediaGalleriesUniqueId, 483 PrefRegistrySyncable::UNSYNCABLE_PREF);
483 kInvalidMediaGalleryPrefId + 1, 484 registry->RegisterUint64Pref(prefs::kMediaGalleriesUniqueId,
484 PrefServiceSyncable::UNSYNCABLE_PREF); 485 kInvalidMediaGalleryPrefId + 1,
486 PrefRegistrySyncable::UNSYNCABLE_PREF);
485 } 487 }
486 488
487 extensions::ExtensionPrefs* 489 extensions::ExtensionPrefs*
488 MediaGalleriesPreferences::GetExtensionPrefs() const { 490 MediaGalleriesPreferences::GetExtensionPrefs() const {
489 ExtensionService* extension_service = 491 ExtensionService* extension_service =
490 extensions::ExtensionSystem::Get(profile_)->extension_service(); 492 extensions::ExtensionSystem::Get(profile_)->extension_service();
491 return extension_service->extension_prefs(); 493 return extension_service->extension_prefs();
492 } 494 }
493 495
494 } // namespace chrome 496 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698