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

Side by Side Diff: chrome/common/extensions/permissions/permissions_data.cc

Issue 51433002: Enable permission warnings from ManifestHandlers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Working on adding ManifestPermissionSet to PermissionSet. Created 7 years, 1 month 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/common/extensions/permissions/permissions_data.h" 5 #include "chrome/common/extensions/permissions/permissions_data.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 // Returns true if this extension id is from a trusted provider. 239 // Returns true if this extension id is from a trusted provider.
240 bool IsTrustedId(const std::string& extension_id) { 240 bool IsTrustedId(const std::string& extension_id) {
241 // See http://b/4946060 for more details. 241 // See http://b/4946060 for more details.
242 return extension_id == std::string("nckgahadagoaajjgafhacjanaoiihapd"); 242 return extension_id == std::string("nckgahadagoaajjgafhacjanaoiihapd");
243 } 243 }
244 244
245 } // namespace 245 } // namespace
246 246
247 struct PermissionsData::InitialPermissions { 247 struct PermissionsData::InitialPermissions {
248 APIPermissionSet api_permissions; 248 APIPermissionSet api_permissions;
249 ManifestPermissionSet manifest_permissions;
249 URLPatternSet host_permissions; 250 URLPatternSet host_permissions;
250 URLPatternSet scriptable_hosts; 251 URLPatternSet scriptable_hosts;
251 }; 252 };
252 253
253 PermissionsData::PermissionsData() { 254 PermissionsData::PermissionsData() {
254 } 255 }
255 256
256 PermissionsData::~PermissionsData() { 257 PermissionsData::~PermissionsData() {
257 } 258 }
258 259
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 error)) { 601 error)) {
601 return false; 602 return false;
602 } 603 }
603 604
604 return true; 605 return true;
605 } 606 }
606 607
607 void PermissionsData::FinalizePermissions(Extension* extension) { 608 void PermissionsData::FinalizePermissions(Extension* extension) {
608 active_permissions_ = new PermissionSet( 609 active_permissions_ = new PermissionSet(
609 initial_required_permissions_->api_permissions, 610 initial_required_permissions_->api_permissions,
611 initial_required_permissions_->manifest_permissions,
610 initial_required_permissions_->host_permissions, 612 initial_required_permissions_->host_permissions,
611 initial_required_permissions_->scriptable_hosts); 613 initial_required_permissions_->scriptable_hosts);
612 614
613 required_permission_set_ = new PermissionSet( 615 required_permission_set_ = new PermissionSet(
614 initial_required_permissions_->api_permissions, 616 initial_required_permissions_->api_permissions,
617 initial_required_permissions_->manifest_permissions,
615 initial_required_permissions_->host_permissions, 618 initial_required_permissions_->host_permissions,
616 initial_required_permissions_->scriptable_hosts); 619 initial_required_permissions_->scriptable_hosts);
617 620
618 optional_permission_set_ = new PermissionSet( 621 optional_permission_set_ = new PermissionSet(
619 initial_optional_permissions_->api_permissions, 622 initial_optional_permissions_->api_permissions,
623 initial_optional_permissions_->manifest_permissions,
620 initial_optional_permissions_->host_permissions, 624 initial_optional_permissions_->host_permissions,
621 URLPatternSet()); 625 URLPatternSet());
622 626
623 initial_required_permissions_.reset(); 627 initial_required_permissions_.reset();
624 initial_optional_permissions_.reset(); 628 initial_optional_permissions_.reset();
625 } 629 }
626 630
627 } // namespace extensions 631 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698