OLD | NEW |
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/extension.h" | 5 #include "chrome/common/extensions/extension.h" |
6 | 6 |
7 #include "base/base64.h" | 7 #include "base/base64.h" |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
(...skipping 2944 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2955 | 2955 |
2956 if (!incognito_split_mode_) { | 2956 if (!incognito_split_mode_) { |
2957 *utf8_error = errors::kInvalidIncognitoModeForPlatformApp; | 2957 *utf8_error = errors::kInvalidIncognitoModeForPlatformApp; |
2958 return false; | 2958 return false; |
2959 } | 2959 } |
2960 | 2960 |
2961 return true; | 2961 return true; |
2962 } | 2962 } |
2963 | 2963 |
2964 bool Extension::CheckConflictingFeatures(std::string* utf8_error) const { | 2964 bool Extension::CheckConflictingFeatures(std::string* utf8_error) const { |
2965 if (has_lazy_background_page() && | 2965 // TODO(fsamuel): What to do here? |
2966 HasAPIPermission(APIPermission::kWebRequest)) { | 2966 //if (has_lazy_background_page() && |
2967 *utf8_error = errors::kWebRequestConflictsWithLazyBackground; | 2967 // HasAPIPermission(APIPermission::kWebRequest)) { |
2968 return false; | 2968 // *utf8_error = errors::kWebRequestConflictsWithLazyBackground; |
2969 } | 2969 // return false; |
| 2970 //} |
2970 | 2971 |
2971 return true; | 2972 return true; |
2972 } | 2973 } |
2973 | 2974 |
2974 ExtensionInfo::ExtensionInfo(const DictionaryValue* manifest, | 2975 ExtensionInfo::ExtensionInfo(const DictionaryValue* manifest, |
2975 const std::string& id, | 2976 const std::string& id, |
2976 const FilePath& path, | 2977 const FilePath& path, |
2977 Manifest::Location location) | 2978 Manifest::Location location) |
2978 : extension_id(id), | 2979 : extension_id(id), |
2979 extension_path(path), | 2980 extension_path(path), |
(...skipping 13 matching lines...) Expand all Loading... |
2993 | 2994 |
2994 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo( | 2995 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo( |
2995 const Extension* extension, | 2996 const Extension* extension, |
2996 const PermissionSet* permissions, | 2997 const PermissionSet* permissions, |
2997 Reason reason) | 2998 Reason reason) |
2998 : reason(reason), | 2999 : reason(reason), |
2999 extension(extension), | 3000 extension(extension), |
3000 permissions(permissions) {} | 3001 permissions(permissions) {} |
3001 | 3002 |
3002 } // namespace extensions | 3003 } // namespace extensions |
OLD | NEW |