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

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

Issue 12340111: Introduce //components/user_prefs, use to eliminate c/b/prefs dependency in Autofill. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pure merge of LKGR Created 7 years, 9 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_galleries/media_galleries_preferences.h" 5 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
6 6
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/extensions/api/media_galleries_private/gallery_watch_st ate_tracker.h" 13 #include "chrome/browser/extensions/api/media_galleries_private/gallery_watch_st ate_tracker.h"
14 #include "chrome/browser/extensions/extension_prefs.h" 14 #include "chrome/browser/extensions/extension_prefs.h"
15 #include "chrome/browser/extensions/extension_service.h" 15 #include "chrome/browser/extensions/extension_service.h"
16 #include "chrome/browser/extensions/extension_system.h" 16 #include "chrome/browser/extensions/extension_system.h"
17 #include "chrome/browser/media_galleries/media_file_system_registry.h" 17 #include "chrome/browser/media_galleries/media_file_system_registry.h"
18 #include "chrome/browser/prefs/pref_registry_syncable.h"
19 #include "chrome/browser/prefs/scoped_user_pref_update.h" 18 #include "chrome/browser/prefs/scoped_user_pref_update.h"
20 #include "chrome/browser/profiles/profile.h" 19 #include "chrome/browser/profiles/profile.h"
21 #include "chrome/browser/storage_monitor/media_storage_util.h" 20 #include "chrome/browser/storage_monitor/media_storage_util.h"
22 #include "chrome/common/chrome_paths.h" 21 #include "chrome/common/chrome_paths.h"
23 #include "chrome/common/extensions/extension.h" 22 #include "chrome/common/extensions/extension.h"
24 #include "chrome/common/extensions/permissions/api_permission.h" 23 #include "chrome/common/extensions/permissions/api_permission.h"
25 #include "chrome/common/extensions/permissions/media_galleries_permission.h" 24 #include "chrome/common/extensions/permissions/media_galleries_permission.h"
26 #include "chrome/common/pref_names.h" 25 #include "chrome/common/pref_names.h"
26 #include "components/user_prefs/pref_registry_syncable.h"
27 27
28 namespace chrome { 28 namespace chrome {
29 29
30 namespace { 30 namespace {
31 31
32 const char kMediaGalleriesDeviceIdKey[] = "deviceId"; 32 const char kMediaGalleriesDeviceIdKey[] = "deviceId";
33 const char kMediaGalleriesDisplayNameKey[] = "displayName"; 33 const char kMediaGalleriesDisplayNameKey[] = "displayName";
34 const char kMediaGalleriesPathKey[] = "path"; 34 const char kMediaGalleriesPathKey[] = "path";
35 const char kMediaGalleriesPrefIdKey[] = "prefId"; 35 const char kMediaGalleriesPrefIdKey[] = "prefId";
36 const char kMediaGalleriesTypeKey[] = "type"; 36 const char kMediaGalleriesTypeKey[] = "type";
(...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 } 636 }
637 637
638 extensions::ExtensionPrefs* 638 extensions::ExtensionPrefs*
639 MediaGalleriesPreferences::GetExtensionPrefs() const { 639 MediaGalleriesPreferences::GetExtensionPrefs() const {
640 ExtensionService* extension_service = 640 ExtensionService* extension_service =
641 extensions::ExtensionSystem::Get(profile_)->extension_service(); 641 extensions::ExtensionSystem::Get(profile_)->extension_service();
642 return extension_service->extension_prefs(); 642 return extension_service->extension_prefs();
643 } 643 }
644 644
645 } // namespace chrome 645 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698