| OLD | NEW |
| 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/common/extensions/extension.h" | 5 #include "chrome/common/extensions/extension.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/base64.h" | 9 #include "base/base64.h" |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 1114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1125 << isolation_string; | 1125 << isolation_string; |
| 1126 } | 1126 } |
| 1127 } | 1127 } |
| 1128 return true; | 1128 return true; |
| 1129 } | 1129 } |
| 1130 | 1130 |
| 1131 bool Extension::LoadWebIntentServices(const extensions::Manifest* manifest, | 1131 bool Extension::LoadWebIntentServices(const extensions::Manifest* manifest, |
| 1132 string16* error) { | 1132 string16* error) { |
| 1133 DCHECK(error); | 1133 DCHECK(error); |
| 1134 | 1134 |
| 1135 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableWebIntents)) | 1135 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableWebIntents)) |
| 1136 return true; | 1136 return true; |
| 1137 | 1137 |
| 1138 if (!manifest->HasKey(keys::kIntents)) | 1138 if (!manifest->HasKey(keys::kIntents)) |
| 1139 return true; | 1139 return true; |
| 1140 | 1140 |
| 1141 DictionaryValue* all_services = NULL; | 1141 DictionaryValue* all_services = NULL; |
| 1142 if (!manifest->GetDictionary(keys::kIntents, &all_services)) { | 1142 if (!manifest->GetDictionary(keys::kIntents, &all_services)) { |
| 1143 *error = ASCIIToUTF16(errors::kInvalidIntents); | 1143 *error = ASCIIToUTF16(errors::kInvalidIntents); |
| 1144 return false; | 1144 return false; |
| 1145 } | 1145 } |
| (...skipping 1896 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3042 already_disabled(false), | 3042 already_disabled(false), |
| 3043 extension(extension) {} | 3043 extension(extension) {} |
| 3044 | 3044 |
| 3045 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo( | 3045 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo( |
| 3046 const Extension* extension, | 3046 const Extension* extension, |
| 3047 const ExtensionPermissionSet* permissions, | 3047 const ExtensionPermissionSet* permissions, |
| 3048 Reason reason) | 3048 Reason reason) |
| 3049 : reason(reason), | 3049 : reason(reason), |
| 3050 extension(extension), | 3050 extension(extension), |
| 3051 permissions(permissions) {} | 3051 permissions(permissions) {} |
| OLD | NEW |