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

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

Issue 315573003: Remove PermissionsData::ForExtension() completely (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 const extensions::PermissionsData* permissions_data = 99 const extensions::PermissionsData* permissions_data =
100 extensions::PermissionsData::ForExtension(*i); 100 (*i)->permissions_data();
101 if (permissions_data->HasAPIPermission( 101 if (permissions_data->HasAPIPermission(
102 extensions::APIPermission::kMediaGalleries) || 102 extensions::APIPermission::kMediaGalleries) ||
103 permissions_data->HasAPIPermission( 103 permissions_data->HasAPIPermission(
104 extensions::APIPermission::kMediaGalleriesPrivate)) { 104 extensions::APIPermission::kMediaGalleriesPrivate)) {
105 count++; 105 count++;
106 } 106 }
107 } 107 }
108 return count; 108 return count;
109 } 109 }
110 110
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 // means it may be overwritten simply by getting new volume metadata. 272 // means it may be overwritten simply by getting new volume metadata.
273 // A display_name with version 1 should not be overwritten. 273 // A display_name with version 1 should not be overwritten.
274 dict->SetInteger(kMediaGalleriesPrefsVersionKey, gallery.prefs_version); 274 dict->SetInteger(kMediaGalleriesPrefsVersionKey, gallery.prefs_version);
275 275
276 return dict; 276 return dict;
277 } 277 }
278 278
279 bool HasAutoDetectedGalleryPermission(const extensions::Extension& extension) { 279 bool HasAutoDetectedGalleryPermission(const extensions::Extension& extension) {
280 extensions::MediaGalleriesPermission::CheckParam param( 280 extensions::MediaGalleriesPermission::CheckParam param(
281 extensions::MediaGalleriesPermission::kAllAutoDetectedPermission); 281 extensions::MediaGalleriesPermission::kAllAutoDetectedPermission);
282 return extensions::PermissionsData::ForExtension(&extension)-> 282 return extension.permissions_data()->CheckAPIPermissionWithParam(
283 CheckAPIPermissionWithParam(extensions::APIPermission::kMediaGalleries, 283 extensions::APIPermission::kMediaGalleries, &param);
284 &param);
285 } 284 }
286 285
287 // Retrieves the MediaGalleryPermission from the given dictionary; DCHECKs on 286 // Retrieves the MediaGalleryPermission from the given dictionary; DCHECKs on
288 // failure. 287 // failure.
289 bool GetMediaGalleryPermissionFromDictionary( 288 bool GetMediaGalleryPermissionFromDictionary(
290 const base::DictionaryValue* dict, 289 const base::DictionaryValue* dict,
291 MediaGalleryPermission* out_permission) { 290 MediaGalleryPermission* out_permission) {
292 std::string string_id; 291 std::string string_id;
293 if (dict->GetString(kMediaGalleryIdKey, &string_id) && 292 if (dict->GetString(kMediaGalleryIdKey, &string_id) &&
294 base::StringToUint64(string_id, &out_permission->pref_id) && 293 base::StringToUint64(string_id, &out_permission->pref_id) &&
(...skipping 944 matching lines...) Expand 10 before | Expand all | Expand 10 after
1239 if (extension_prefs_for_testing_) 1238 if (extension_prefs_for_testing_)
1240 return extension_prefs_for_testing_; 1239 return extension_prefs_for_testing_;
1241 return extensions::ExtensionPrefs::Get(profile_); 1240 return extensions::ExtensionPrefs::Get(profile_);
1242 } 1241 }
1243 1242
1244 void MediaGalleriesPreferences::SetExtensionPrefsForTesting( 1243 void MediaGalleriesPreferences::SetExtensionPrefsForTesting(
1245 extensions::ExtensionPrefs* extension_prefs) { 1244 extensions::ExtensionPrefs* extension_prefs) {
1246 DCHECK(IsInitialized()); 1245 DCHECK(IsInitialized());
1247 extension_prefs_for_testing_ = extension_prefs; 1246 extension_prefs_for_testing_ = extension_prefs;
1248 } 1247 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698