| Index: chrome/common/extensions/extension.cc
|
| diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
|
| index adbaa0a3a2f0a18c23cf72884fec9323ec7de0e4..85e60506d7651a0796a44ae01227d4a2ab226f82 100644
|
| --- a/chrome/common/extensions/extension.cc
|
| +++ b/chrome/common/extensions/extension.cc
|
| @@ -27,8 +27,8 @@
|
| #include "chrome/common/chrome_version_info.h"
|
| #include "chrome/common/extensions/csp_validator.h"
|
| #include "chrome/common/extensions/extension_action.h"
|
| -#include "chrome/common/extensions/extension_manifest_constants.h"
|
| #include "chrome/common/extensions/extension_error_utils.h"
|
| +#include "chrome/common/extensions/extension_manifest_constants.h"
|
| #include "chrome/common/extensions/extension_resource.h"
|
| #include "chrome/common/extensions/feature.h"
|
| #include "chrome/common/extensions/file_browser_handler.h"
|
| @@ -3010,7 +3010,7 @@ const SkBitmap& Extension::GetDefaultIcon(bool is_app) {
|
| // static
|
| GURL Extension::GetBaseURLFromExtensionId(const std::string& extension_id) {
|
| return GURL(std::string(chrome::kExtensionScheme) +
|
| - chrome::kStandardSchemeSeparator + extension_id + "/");
|
| + content::kStandardSchemeSeparator + extension_id + "/");
|
| }
|
|
|
| bool Extension::InitFromValue(int flags, string16* error) {
|
|
|