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

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

Issue 309533007: Refactor PermissionsData pt1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Latest master Created 6 years, 6 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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 if (!profile) 89 if (!profile)
90 return count; 90 return count;
91 ExtensionService* extension_service = 91 ExtensionService* extension_service =
92 extensions::ExtensionSystem::Get(profile)->extension_service(); 92 extensions::ExtensionSystem::Get(profile)->extension_service();
93 if (!extension_service) 93 if (!extension_service)
94 return count; 94 return count;
95 95
96 const extensions::ExtensionSet* extensions = extension_service->extensions(); 96 const extensions::ExtensionSet* extensions = extension_service->extensions();
97 for (extensions::ExtensionSet::const_iterator i = extensions->begin(); 97 for (extensions::ExtensionSet::const_iterator i = extensions->begin();
98 i != extensions->end(); ++i) { 98 i != extensions->end(); ++i) {
99 if (extensions::PermissionsData::HasAPIPermission( 99 const extensions::PermissionsData* permissions_data =
100 *i, extensions::APIPermission::kMediaGalleries) || 100 extensions::PermissionsData::ForExtension(*i);
101 extensions::PermissionsData::HasAPIPermission( 101 if (permissions_data->HasAPIPermission(
102 *i, extensions::APIPermission::kMediaGalleriesPrivate)) { 102 extensions::APIPermission::kMediaGalleries) ||
103 permissions_data->HasAPIPermission(
104 extensions::APIPermission::kMediaGalleriesPrivate)) {
103 count++; 105 count++;
104 } 106 }
105 } 107 }
106 return count; 108 return count;
107 } 109 }
108 110
109 bool GetPrefId(const base::DictionaryValue& dict, MediaGalleryPrefId* value) { 111 bool GetPrefId(const base::DictionaryValue& dict, MediaGalleryPrefId* value) {
110 std::string string_id; 112 std::string string_id;
111 if (!dict.GetString(kMediaGalleriesPrefIdKey, &string_id) || 113 if (!dict.GetString(kMediaGalleriesPrefIdKey, &string_id) ||
112 !base::StringToUint64(string_id, value)) { 114 !base::StringToUint64(string_id, value)) {
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 // means it may be overwritten simply by getting new volume metadata. 272 // means it may be overwritten simply by getting new volume metadata.
271 // A display_name with version 1 should not be overwritten. 273 // A display_name with version 1 should not be overwritten.
272 dict->SetInteger(kMediaGalleriesPrefsVersionKey, gallery.prefs_version); 274 dict->SetInteger(kMediaGalleriesPrefsVersionKey, gallery.prefs_version);
273 275
274 return dict; 276 return dict;
275 } 277 }
276 278
277 bool HasAutoDetectedGalleryPermission(const extensions::Extension& extension) { 279 bool HasAutoDetectedGalleryPermission(const extensions::Extension& extension) {
278 extensions::MediaGalleriesPermission::CheckParam param( 280 extensions::MediaGalleriesPermission::CheckParam param(
279 extensions::MediaGalleriesPermission::kAllAutoDetectedPermission); 281 extensions::MediaGalleriesPermission::kAllAutoDetectedPermission);
280 return extensions::PermissionsData::CheckAPIPermissionWithParam( 282 return extensions::PermissionsData::ForExtension(&extension)->
281 &extension, extensions::APIPermission::kMediaGalleries, &param); 283 CheckAPIPermissionWithParam(extensions::APIPermission::kMediaGalleries,
284 &param);
282 } 285 }
283 286
284 // Retrieves the MediaGalleryPermission from the given dictionary; DCHECKs on 287 // Retrieves the MediaGalleryPermission from the given dictionary; DCHECKs on
285 // failure. 288 // failure.
286 bool GetMediaGalleryPermissionFromDictionary( 289 bool GetMediaGalleryPermissionFromDictionary(
287 const base::DictionaryValue* dict, 290 const base::DictionaryValue* dict,
288 MediaGalleryPermission* out_permission) { 291 MediaGalleryPermission* out_permission) {
289 std::string string_id; 292 std::string string_id;
290 if (dict->GetString(kMediaGalleryIdKey, &string_id) && 293 if (dict->GetString(kMediaGalleryIdKey, &string_id) &&
291 base::StringToUint64(string_id, &out_permission->pref_id) && 294 base::StringToUint64(string_id, &out_permission->pref_id) &&
(...skipping 944 matching lines...) Expand 10 before | Expand all | Expand 10 after
1236 if (extension_prefs_for_testing_) 1239 if (extension_prefs_for_testing_)
1237 return extension_prefs_for_testing_; 1240 return extension_prefs_for_testing_;
1238 return extensions::ExtensionPrefs::Get(profile_); 1241 return extensions::ExtensionPrefs::Get(profile_);
1239 } 1242 }
1240 1243
1241 void MediaGalleriesPreferences::SetExtensionPrefsForTesting( 1244 void MediaGalleriesPreferences::SetExtensionPrefsForTesting(
1242 extensions::ExtensionPrefs* extension_prefs) { 1245 extensions::ExtensionPrefs* extension_prefs) {
1243 DCHECK(IsInitialized()); 1246 DCHECK(IsInitialized());
1244 extension_prefs_for_testing_ = extension_prefs; 1247 extension_prefs_for_testing_ = extension_prefs;
1245 } 1248 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698