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

Side by Side Diff: extensions/common/permissions/media_galleries_permission.cc

Issue 221353003: Make unknown extension subpermissions warnings instead of errors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "extensions/common/permissions/media_galleries_permission.h" 5 #include "extensions/common/permissions/media_galleries_permission.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 49
50 MediaGalleriesPermission::MediaGalleriesPermission( 50 MediaGalleriesPermission::MediaGalleriesPermission(
51 const APIPermissionInfo* info) 51 const APIPermissionInfo* info)
52 : SetDisjunctionPermission<MediaGalleriesPermissionData, 52 : SetDisjunctionPermission<MediaGalleriesPermissionData,
53 MediaGalleriesPermission>(info) { 53 MediaGalleriesPermission>(info) {
54 } 54 }
55 55
56 MediaGalleriesPermission::~MediaGalleriesPermission() { 56 MediaGalleriesPermission::~MediaGalleriesPermission() {
57 } 57 }
58 58
59 bool MediaGalleriesPermission::FromValue(const base::Value* value, 59 bool MediaGalleriesPermission::FromValue(
60 std::string* error) { 60 const base::Value* value,
61 std::string* error,
62 std::vector<std::string>* unhandled_permissions) {
63 std::vector<std::string> unhandled_sub_permissions;
61 if (!SetDisjunctionPermission<MediaGalleriesPermissionData, 64 if (!SetDisjunctionPermission<MediaGalleriesPermissionData,
62 MediaGalleriesPermission>::FromValue(value, 65 MediaGalleriesPermission>::FromValue(
63 error)) { 66 value, error, &unhandled_sub_permissions)) {
67 unhandled_permissions->insert(unhandled_permissions->end(),
68 unhandled_sub_permissions.begin(),
69 unhandled_sub_permissions.end());
64 return false; 70 return false;
65 } 71 }
66 72
73 for (size_t i = 0; i < unhandled_sub_permissions.size(); i++) {
74 unhandled_permissions->push_back(
75 "{\"mediaGalleries\": [" + unhandled_sub_permissions[i] + "]}");
76 }
77
67 bool has_read = false; 78 bool has_read = false;
68 bool has_copy_to = false; 79 bool has_copy_to = false;
69 bool has_delete = false; 80 bool has_delete = false;
70 for (std::set<MediaGalleriesPermissionData>::const_iterator it = 81 for (std::set<MediaGalleriesPermissionData>::const_iterator it =
71 data_set_.begin(); it != data_set_.end(); ++it) { 82 data_set_.begin(); it != data_set_.end(); ++it) {
72 if (it->permission() == kAllAutoDetectedPermission || 83 if (it->permission() == kAllAutoDetectedPermission ||
73 it->permission() == kScanPermission) { 84 it->permission() == kScanPermission) {
74 continue; 85 continue;
75 } 86 }
76 if (it->permission() == kReadPermission) { 87 if (it->permission() == kReadPermission) {
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 } 159 }
149 if (has_delete) { 160 if (has_delete) {
150 result.push_back(PermissionMessage( 161 result.push_back(PermissionMessage(
151 PermissionMessage::kMediaGalleriesAllGalleriesDelete, 162 PermissionMessage::kMediaGalleriesAllGalleriesDelete,
152 base::string16())); 163 base::string16()));
153 } 164 }
154 return result; 165 return result;
155 } 166 }
156 167
157 } // namespace extensions 168 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698