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

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

Issue 22794012: Rename extension_manifest_keys namespace to extensions::manifest_keys. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 4 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) 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 10 matching lines...) Expand all
21 #include "chrome/common/extensions/permissions/permission_set.h" 21 #include "chrome/common/extensions/permissions/permission_set.h"
22 #include "chrome/common/extensions/permissions/permissions_info.h" 22 #include "chrome/common/extensions/permissions/permissions_info.h"
23 #include "content/public/common/url_constants.h" 23 #include "content/public/common/url_constants.h"
24 #include "extensions/common/constants.h" 24 #include "extensions/common/constants.h"
25 #include "extensions/common/error_utils.h" 25 #include "extensions/common/error_utils.h"
26 #include "extensions/common/switches.h" 26 #include "extensions/common/switches.h"
27 #include "extensions/common/url_pattern_set.h" 27 #include "extensions/common/url_pattern_set.h"
28 #include "extensions/common/user_script.h" 28 #include "extensions/common/user_script.h"
29 #include "url/gurl.h" 29 #include "url/gurl.h"
30 30
31 namespace keys = extension_manifest_keys; 31 namespace keys = extensions::manifest_keys;
32 namespace errors = extension_manifest_errors; 32 namespace errors = extension_manifest_errors;
33 33
34 namespace extensions { 34 namespace extensions {
35 35
36 namespace { 36 namespace {
37 37
38 PermissionsData::PolicyDelegate* g_policy_delegate = NULL; 38 PermissionsData::PolicyDelegate* g_policy_delegate = NULL;
39 39
40 bool ContainsManifestForbiddenPermission(const APIPermissionSet& apis, 40 bool ContainsManifestForbiddenPermission(const APIPermissionSet& apis,
41 string16* error) { 41 string16* error) {
(...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after
634 optional_permission_set_ = new PermissionSet( 634 optional_permission_set_ = new PermissionSet(
635 initial_optional_permissions_->api_permissions, 635 initial_optional_permissions_->api_permissions,
636 initial_optional_permissions_->host_permissions, 636 initial_optional_permissions_->host_permissions,
637 URLPatternSet()); 637 URLPatternSet());
638 638
639 initial_required_permissions_.reset(); 639 initial_required_permissions_.reset();
640 initial_optional_permissions_.reset(); 640 initial_optional_permissions_.reset();
641 } 641 }
642 642
643 } // namespace extensions 643 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/common/extensions/mime_types_handler.cc ('k') | chrome/common/extensions/sync_type_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698