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

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

Issue 140343002: extensions: Relocate pref name constants. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add missing include for mac Created 6 years, 11 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/base_paths_posix.h" 7 #include "base/base_paths_posix.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/i18n/time_formatting.h" 9 #include "base/i18n/time_formatting.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 13 matching lines...) Expand all
24 #include "chrome/browser/media_galleries/media_file_system_registry.h" 24 #include "chrome/browser/media_galleries/media_file_system_registry.h"
25 #include "chrome/browser/media_galleries/media_galleries_histograms.h" 25 #include "chrome/browser/media_galleries/media_galleries_histograms.h"
26 #include "chrome/browser/profiles/profile.h" 26 #include "chrome/browser/profiles/profile.h"
27 #include "chrome/browser/storage_monitor/media_storage_util.h" 27 #include "chrome/browser/storage_monitor/media_storage_util.h"
28 #include "chrome/browser/storage_monitor/storage_monitor.h" 28 #include "chrome/browser/storage_monitor/storage_monitor.h"
29 #include "chrome/common/chrome_paths.h" 29 #include "chrome/common/chrome_paths.h"
30 #include "chrome/common/extensions/permissions/media_galleries_permission.h" 30 #include "chrome/common/extensions/permissions/media_galleries_permission.h"
31 #include "chrome/common/pref_names.h" 31 #include "chrome/common/pref_names.h"
32 #include "components/user_prefs/pref_registry_syncable.h" 32 #include "components/user_prefs/pref_registry_syncable.h"
33 #include "content/public/browser/browser_thread.h" 33 #include "content/public/browser/browser_thread.h"
34 #include "extensions/browser/pref_names.h"
34 #include "extensions/common/extension.h" 35 #include "extensions/common/extension.h"
35 #include "extensions/common/extension_set.h" 36 #include "extensions/common/extension_set.h"
36 #include "extensions/common/permissions/api_permission.h" 37 #include "extensions/common/permissions/api_permission.h"
37 #include "extensions/common/permissions/permissions_data.h" 38 #include "extensions/common/permissions/permissions_data.h"
38 #include "grit/generated_resources.h" 39 #include "grit/generated_resources.h"
39 #include "ui/base/l10n/l10n_util.h" 40 #include "ui/base/l10n/l10n_util.h"
40 #include "ui/base/text/bytes_formatting.h" 41 #include "ui/base/text/bytes_formatting.h"
41 42
42 using base::DictionaryValue; 43 using base::DictionaryValue;
43 using base::ListValue; 44 using base::ListValue;
(...skipping 1073 matching lines...) Expand 10 before | Expand all | Expand 10 after
1117 } 1118 }
1118 1119
1119 return result; 1120 return result;
1120 } 1121 }
1121 1122
1122 void MediaGalleriesPreferences::RemoveGalleryPermissionsFromPrefs( 1123 void MediaGalleriesPreferences::RemoveGalleryPermissionsFromPrefs(
1123 MediaGalleryPrefId gallery_id) { 1124 MediaGalleryPrefId gallery_id) {
1124 DCHECK(IsInitialized()); 1125 DCHECK(IsInitialized());
1125 ExtensionPrefs* prefs = GetExtensionPrefs(); 1126 ExtensionPrefs* prefs = GetExtensionPrefs();
1126 const base::DictionaryValue* extensions = 1127 const base::DictionaryValue* extensions =
1127 prefs->pref_service()->GetDictionary(prefs::kExtensionsPref); 1128 prefs->pref_service()->GetDictionary(extensions::pref_names::kExtensions);
1128 if (!extensions) 1129 if (!extensions)
1129 return; 1130 return;
1130 1131
1131 for (base::DictionaryValue::Iterator iter(*extensions); !iter.IsAtEnd(); 1132 for (base::DictionaryValue::Iterator iter(*extensions); !iter.IsAtEnd();
1132 iter.Advance()) { 1133 iter.Advance()) {
1133 if (!extensions::Extension::IdIsValid(iter.key())) { 1134 if (!extensions::Extension::IdIsValid(iter.key())) {
1134 NOTREACHED(); 1135 NOTREACHED();
1135 continue; 1136 continue;
1136 } 1137 }
1137 UnsetGalleryPermissionInPrefs(iter.key(), gallery_id); 1138 UnsetGalleryPermissionInPrefs(iter.key(), gallery_id);
1138 } 1139 }
1139 } 1140 }
1140 1141
1141 ExtensionPrefs* MediaGalleriesPreferences::GetExtensionPrefs() const { 1142 ExtensionPrefs* MediaGalleriesPreferences::GetExtensionPrefs() const {
1142 DCHECK(IsInitialized()); 1143 DCHECK(IsInitialized());
1143 if (extension_prefs_for_testing_) 1144 if (extension_prefs_for_testing_)
1144 return extension_prefs_for_testing_; 1145 return extension_prefs_for_testing_;
1145 return extensions::ExtensionPrefs::Get(profile_); 1146 return extensions::ExtensionPrefs::Get(profile_);
1146 } 1147 }
1147 1148
1148 void MediaGalleriesPreferences::SetExtensionPrefsForTesting( 1149 void MediaGalleriesPreferences::SetExtensionPrefsForTesting(
1149 extensions::ExtensionPrefs* extension_prefs) { 1150 extensions::ExtensionPrefs* extension_prefs) {
1150 DCHECK(IsInitialized()); 1151 DCHECK(IsInitialized());
1151 extension_prefs_for_testing_ = extension_prefs; 1152 extension_prefs_for_testing_ = extension_prefs;
1152 } 1153 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698