| Index: chrome/common/extensions/manifest_url_handler.cc
|
| diff --git a/chrome/common/extensions/manifest_url_handler.cc b/chrome/common/extensions/manifest_url_handler.cc
|
| index eb5120165e32806036904f5d1e963e445778baea..d05ee1333c40f7b8c578215ca40c9d6cb27deac5 100644
|
| --- a/chrome/common/extensions/manifest_url_handler.cc
|
| +++ b/chrome/common/extensions/manifest_url_handler.cc
|
| @@ -13,13 +13,13 @@
|
| #include "base/values.h"
|
| #include "chrome/common/chrome_constants.h"
|
| #include "chrome/common/extensions/extension_file_util.h"
|
| -#include "chrome/common/extensions/extension_manifest_constants.h"
|
| #include "chrome/common/extensions/permissions/api_permission.h"
|
| #include "chrome/common/extensions/permissions/api_permission_set.h"
|
| #include "chrome/common/extensions/permissions/permissions_data.h"
|
| #include "chrome/common/url_constants.h"
|
| #include "extensions/common/error_utils.h"
|
| #include "extensions/common/manifest.h"
|
| +#include "extensions/common/manifest_constants.h"
|
| #include "grit/generated_resources.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
|
|
| @@ -27,11 +27,11 @@
|
| #include "ui/keyboard/keyboard_constants.h"
|
| #endif
|
|
|
| -namespace keys = extensions::manifest_keys;
|
| -namespace errors = extension_manifest_errors;
|
| -
|
| namespace extensions {
|
|
|
| +namespace keys = manifest_keys;
|
| +namespace errors = manifest_errors;
|
| +
|
| namespace {
|
|
|
| const char kOverrideExtentUrlPatternFormat[] = "chrome://%s/*";
|
|
|